Commit Graph

13563 Commits

Author SHA1 Message Date
Alys cfb5e2be60 fix bug in Rebirth test, add new tests, adjust apidocs (#7293) 2016-05-16 18:13:49 +02:00
Alys 4bba10fac2 adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298) 2016-05-16 18:08:54 +02:00
Matteo Pagliazzi ad03cc8f9a Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-16 12:55:14 +02:00
Matteo Pagliazzi ab27ef47fe v3 client: misc fixes 2016-05-16 12:54:43 +02:00
Matteo Pagliazzi 4d08fde068 v3: fix auto allocation 2016-05-16 12:17:26 +02:00
Matteo Pagliazzi 793ca3b172 v3: fix tasks saving and selection for rebirth reroll and reset (server-only) 2016-05-16 12:04:09 +02:00
Matteo Pagliazzi ba1628427e v3: fix stealth casting 2016-05-16 11:38:22 +02:00
Blade Barringer 6bbfbbf613 fix: Fix quest progress button 2016-05-15 21:17:11 -05:00
Blade Barringer 08d4b13b05 Merge pull request #7284 from crookedneighbor/debug_inventory
feat: Add modify inventory debug menu
2016-05-15 16:27:09 -05:00
Blade Barringer 21203c3f2e feat: Add modify inventory debug menu 2016-05-15 16:07:30 -05:00
Matteo Pagliazzi 93546f6546 v3: add TODO for client side spells 2016-05-15 22:55:06 +02:00
Alys 4ceab38d0b fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282) 2016-05-15 22:37:31 +02:00
Matteo Pagliazzi faaa52035d v3: more fixes for spells 2016-05-15 22:37:08 +02:00
Matteo Pagliazzi fff65f5dda v3: always save user when casting spell 2016-05-15 22:32:16 +02:00
Matteo Pagliazzi c1c77b68b4 v3: always save user when casting spell 2016-05-15 22:30:04 +02:00
Matteo Pagliazzi 1a14a6f4b7 v3: do not log sensitive data 2016-05-15 22:20:10 +02:00
Matteo Pagliazzi 52bedc3563 v3 client: fix casting spells 2016-05-15 21:17:17 +02:00
Matteo Pagliazzi b31de3845b v3: fix adding multiple tasks 2016-05-15 16:43:17 +02:00
Matteo Pagliazzi 0be5d1da9c v3: misc fixes 2016-05-15 15:10:41 +02:00
Matteo Pagliazzi 3fbc156811 v3: misc fixes 2016-05-15 14:20:20 +02:00
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
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