Commit graph

13646 commits

Author SHA1 Message Date
Blade Barringer
164c024512 Merge branch 'set-cron_make-admin' into api-v3 2016-05-15 07:17:09 -05:00
Blade Barringer
2851af1a29 chore: Disable make admin debug route for v3 prod testing 2016-05-15 07:01:09 -05:00
Blade Barringer
44c9449913 feat: Separate out update-user into set-cron and make-admin debug routes 2016-05-15 06:58:54 -05:00
Matteo Pagliazzi
6ec4d942df v3: disable Bluebird warning for missing return, fixes #7269 2016-05-15 13:38:18 +02:00
Matteo Pagliazzi
23a9a3e0e4 v3 client: support unlinking not found challenges tasks 2016-05-15 13:00:42 +02:00
Matteo Pagliazzi
438d2779b5 v3 common: fix tags tests 2016-05-15 12:45:27 +02:00
Matteo Pagliazzi
cb0939a38c v3 client: fix filtering by tag and correctly show tag tooltip 2016-05-15 12:31:27 +02:00
Matteo Pagliazzi
0f7964cac1 v3 client: fix ability to leave challenge 2016-05-15 12:12:19 +02:00
Matteo Pagliazzi
4c056426e8 v3: fix tasks chart 2016-05-15 12:00:50 +02:00
Matteo Pagliazzi
64930ea07f v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons 2016-05-15 11:35:10 +02:00
Matteo Pagliazzi
18ce4127e9 v3 cron: only save modified tasks 2016-05-15 11:31:34 +02:00
Matteo Pagliazzi
708f495684 v3 migration: fix challenge prize 2016-05-15 11:12:12 +02:00
Matteo Pagliazzi
6ab3280045 v3 client: fix group not found when leaving party 2016-05-15 11:06:20 +02:00
Matteo Pagliazzi
a8a063d3f6 v3: execute all actions when leaving a solo party 2016-05-15 11:01:37 +02:00
Matteo Pagliazzi
bbf5791aa0 v3: fix _tmp for crit and streakBonus 2016-05-15 10:45:12 +02:00
Blade Barringer
480937c800 fix: Temporarilly comment out udpate user debug route 2016-05-14 23:07:18 -05:00
Blade Barringer
7b15967215 Merge pull request #7263 from crookedneighbor/debug-update-user
Debug update user
2016-05-14 22:48:20 -05:00
Blade Barringer
4a2e3d4410 lint: Add missing semicolons in test 2016-05-14 22:45:35 -05:00
Blade Barringer
8ae3dd779e Merge pull request #7264 from Alys/karma.conf
remove userServices.js from karma.conf
2016-05-14 22:43:16 -05:00
Blade Barringer
50d7345832 feat: Add make admin button to debug menu 2016-05-14 22:37:26 -05:00
Blade Barringer
bc58bd97bb fix: Correct set cron debug function 2016-05-14 22:33:02 -05:00
Blade Barringer
3b8ce8451b feat: Create debug update user route 2016-05-14 22:30:18 -05:00
Alys
d28860620b remove userServices.js from karma.conf - it's been moved to website/client/js/services 2016-05-15 13:21:08 +10:00
Blade Barringer
ac87366f20 Merge pull request #7261 from crookedneighbor/fix_drops
fix: Alert user that drops were recieved
2016-05-14 21:51:05 -05:00
Blade Barringer
44102f6b46 fix: Alert user that drops were recieved 2016-05-14 18:45:36 -05:00
Alys
887d187691 change "an user" to "a user" in comments and text (no code changes) (#7257) 2016-05-15 01:10:08 +02:00
Sabe Jones
6ceea9346f chore(news): misc announcements 2016-05-14 20:56:22 +00:00
Blade Barringer
8a72c91060 Merge branch 'TheHollidayInn-upstream/api-v3-fixes-2' into api-v3
Closes #7245
2016-05-14 12:00:53 -05:00
Keith Holliday
2d5bf9b1bc Fixed reload tests 2016-05-14 12:00:41 -05:00
Blade Barringer
2487ebac90 chore: Reinstate floating version number for eslint
babel-eslint regression fixed
2016-05-14 11:59:00 -05:00
Keith Holliday
72c1729d54 Loaded completed todos when done is clicked 2016-05-14 11:05:31 -05:00
Keith Holliday
0537ff3552 Fixed battle monsters with friends button 2016-05-14 11:05:31 -05:00
Keith Holliday
936ff1f200 Fixed page reload on settings change 2016-05-14 11:05:31 -05:00
Keith Holliday
409dfbb2b0 Fixed adding and removing tags on tasks 2016-05-14 11:05:31 -05:00
Keith Holliday
6222c23810 Updated spell casting to v3 2016-05-14 11:05:31 -05:00
Keith Holliday
439d20c82e Fixed start party by invites 2016-05-14 11:05:31 -05:00
Blade Barringer
769d9e5148 Merge branch 'Alys-api-v3-apidoc-url' into api-v3 2016-05-14 10:21:04 -05:00
Alys
e4b17d2d04 update apidoc URL in package.json
Closes #7222
2016-05-14 10:20:43 -05:00
Blade Barringer
c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
2016-05-14 10:19:43 -05:00
Blade Barringer
a697d028b7 fix: Correct client request from habitrpg -> tavern 2016-05-14 09:37:21 -05:00
Blade Barringer
e654b47537 Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3 2016-05-14 09:21:55 -05:00
Blade Barringer
56dccf016e chore: clarify comments on cron code 2016-05-14 09:20:57 -05:00
Alys
210d01ddae add a missing variable declaration 2016-05-14 23:01:45 +10:00
Blade Barringer
9969aa667a fix: Remove requirement on message paramter in transfer-gems 2016-05-14 07:37:47 -05:00
Blade Barringer
25f0819f1e chore: Remove unusued variable 2016-05-14 06:59:11 -05:00
Blade Barringer
3e57620666 fix: Set gems sent notification as translatable string 2016-05-14 06:54:44 -05:00
Alys
44e9d8b09e fix tests for /members/transfer-gems 2016-05-14 07:18:00 -04:00
Alys
2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Blade Barringer
4dd7c29baf fix: Add missing type param to equip call
closes #7212
2016-05-13 22:49:05 -05:00