Commit graph

14090 commits

Author SHA1 Message Date
Sabe Jones
1c56648ea4 chore(sprites): compile 2016-07-26 19:42:36 +00:00
Phillip Thelen
24d25026cf Add API calls for shop inventories (#7810)
* Add API call for market inventory

* changes to shop api calls

* optimize shop categories

* add API call for quests

* add api call for time travelers shop

* fic buying items in shops

* fix linting errors

* shop adjustments for iOS app

* add tests to shops

* fix syntax issues

* Code formatting

* correct indentation

* add tests for api routes

* fix time travelers and seasonal

* Increase test coverage for shop routes

* refactor: Pull out trinket count in time traveler route

* refactor: Clarify instructions for seasonal shop script

* lint: Remove extra new line

* Adjust shops common test
2016-07-26 14:36:55 -05:00
Sabe Jones
aa00893f6c feat(content): July 2016 Subscriber (#7833) 2016-07-26 14:20:50 -05:00
Ryan Castner
60367459e8 Fixes #7826 updating blog and adding tumblr links, as well as a developer link. One additional change was made in layout.jade not mentioned in ticket request which also referenced the old blog url, updated to point to new blog url. (#7828) 2016-07-26 21:28:15 +10:00
Sabe Jones
ef65325f67 3.24.1 2016-07-21 17:29:43 +00:00
Sabe Jones
ee5e94bc35 chore(news): Wiki Wednesday 2016-07-21 17:09:19 +00:00
Sabe Jones
8d0e157ead 3.24.0 2016-07-19 19:21:22 +00:00
Sabe Jones
b5f7adfe09 chore(news): Comic-Con announcements 2016-07-19 19:04:28 +00:00
Matteo Pagliazzi
590adb3438 Revert "Deprecate API v2" (#7801) 2016-07-17 18:15:25 +02:00
Matteo Pagliazzi
45c31a2bcf Deprecate API v2 (#7761)
* deprecate api-v2

* remove v2 test helpers

* remove unused string
2016-07-16 19:56:18 +02:00
Blade Barringer
a9c234a6d2 chore(i18n): update locales 2016-07-15 10:53:18 -05:00
Blade Barringer
30e55c16cd chore(i18n): Update locales 2016-07-15 09:06:39 -05:00
Alys
987d580746 fix typo in Bailey news: "featuring and interview with Leslie" ("and" > "an") 2016-07-15 16:19:34 +10:00
Sabe Jones
bd8d7bb745 3.23.1 2016-07-15 03:23:34 +00:00
Sabe Jones
6487860646 chore(news): Staff Spotlight 2016-07-15 03:08:12 +00:00
Alys
852651bc0d 3.23.0 2016-07-14 10:08:53 +10:00
Alys
ee01788647 "allCompletedTodos" option in API for returning all completed To-Dos for when 30 isn't enough (#7773)
* add new "allCompletedTodos" option to API for returning all completed To-Dos at once - fixes #7301

* make minor fixes to allCompletedTodos option

* change allCompletedTodos option to _allCompletedTodos and add a BETA comment
2016-07-14 08:34:48 +10:00
Sabe Jones
dea813c296 3.22.1 2016-07-13 14:58:24 +00:00
Oziris
a19f538b90 Update questsContent.json (#7783)
Fixed an issue with text format in the Axolotl rage effect.
2016-07-13 22:56:40 +10:00
Alys
76b51b8b65 fix apidoc typo: change clear-flags to clearflags 2016-07-13 19:57:29 +10:00
Sabe Jones
0816e69fb6 fix(shrinkwrap): don't upgrade mongoose 2016-07-12 23:48:38 +00:00
Luan
bac1405a20 feat(client): Add notification badge
fixes #4365
closes #7755
2016-07-12 17:56:12 -05:00
Sabe Jones
28ebc92aa9 3.22.0 2016-07-12 20:38:05 +00:00
Sabe Jones
36f1e2dfbb chore(deploy): sprites, shrinkwrap, news 2016-07-12 20:37:04 +00:00
Sabe Jones
01052028fb feat(content): Pet Quest 2016-07 (#7780) 2016-07-12 15:23:45 -05:00
Husman
6543ff89e1 refactor(api): Remove prod check in payments library. Fill out tests
Wasn't able to mock out pushNotifications correctly and left two tests unfinished.

closes #7728
closes #7770
2016-07-12 12:43:17 -05:00
Blade Barringer
e05db11fe0 chore(i18n): update locales 2016-07-11 21:34:54 -05:00
Ross Hardy
2b30c63448 Adding new basic audio theme rosstavoTheme (#7766) 2016-07-12 12:30:44 +10:00
Husman
694cd8e555 feat: allowing the flagging of system messages
closes #7767
closes #7771
2016-07-11 21:28:43 -05:00
Alys
0631e9ba15 delete ancient code for hiding a the huge Spread the Word challenge, which has now been closed 2016-07-10 11:41:28 +10:00
Matteo Pagliazzi
1ab8dab9a3 pusher: onlkeopenaximum 1 connection per brorowser 2016-07-08 17:48:39 +02:00
Sabe Jones
485deb1a70 3.21.1 2016-07-07 22:54:00 +00:00
Sabe Jones
03cee070e9 chore(npm): update shrinkwrap 2016-07-07 22:53:08 +00:00
Sabe Jones
52ae23e9bf chore(news): misc Bailey 2016-07-07 22:40:50 +00:00
Sabe Jones
46d618327a fix(contact): clarify merch inquiries 2016-07-07 14:48:22 -05:00
Sabe Jones
cfd5455e3b 3.21.0 2016-07-05 20:58:58 +00:00
Sabe Jones
3eac65c4bd chore(npm): update shrinkwrap 2016-07-05 20:58:36 +00:00
Sabe Jones
ff3f339c2e feat(content): Armoire and BGs 2016-07 (#7762)
* feat(content): Armoire and BGs 2016-07

* fix(backgrounds): resize Dilatory Castle
Also fixes a long-overlooked issue where the Egg Hunt quest remained available long after its event ended.
2016-07-05 15:49:21 -05:00
Matteo Pagliazzi
d514109e39 Merge branch 'iap-fix' into develop 2016-07-04 17:43:26 +02:00
Matteo Pagliazzi
6120a29158 remove console.log 2016-07-04 17:42:33 +02:00
Matteo Pagliazzi
76397e64af upgrade in-app-purchase 2016-07-04 17:23:49 +02:00
Matteo Pagliazzi
8be5ba76dd add some logging 2016-07-04 16:46:41 +02:00
Matteo Pagliazzi
d4cff995e8 fix isValidated and port iOS iap code 2016-07-04 16:12:43 +02:00
Matteo Pagliazzi
dff9356778 remove redundant export for iap 2016-07-04 15:50:40 +02:00
Matteo Pagliazzi
0caeb518af Merge branch 'develop' into iap-fix 2016-07-04 15:45:56 +02:00
Matteo Pagliazzi
a2da583db8 port android iap code to v3 2016-07-04 15:45:52 +02:00
Matteo Pagliazzi
f8760a337a parse receipt object 2016-07-04 15:06:35 +02:00
Matteo Pagliazzi
e19657b8ac more logging 2016-07-04 14:58:50 +02:00
Matteo Pagliazzi
e933914548 more logging 2016-07-04 14:43:15 +02:00
Blade Barringer
01dba9a4be chore(i18n): update locales 2016-07-02 23:05:08 -05:00