Commit Graph

14099 Commits

Author SHA1 Message Date
Sabe Jones 8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Blade Barringer e124b1a00b Merge pull request #6894 from TheHollidayInn/api-v3-development-controller
Added development controller, middleware, and initial tests
2016-03-18 16:06:10 -05:00
Sabe Jones b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Keith Holliday a3d7edd0c1 Renamed namespace to debug and added unit test for middleware 2016-03-18 14:05:14 -05:00
Keith Holliday b46219adc5 Added tests for challenge task scoring and moved scoring code to model 2016-03-18 14:00:14 -05:00
Blade Barringer 99ff440abc Merge pull request #6896 from crookedneighbor/v3_update_user_routes
[V3] WIP - User update routes
2016-03-18 08:54:22 -05:00
Blade Barringer 75ed4080dc tests: Clean up styling of auth update tests 2016-03-18 08:42:03 -05:00
Blade Barringer f6f5b1a118 tests: Remove dependency on mongoose User model in auth tests 2016-03-18 07:57:42 -05:00
Blade Barringer 2ef176c6f2 refactor: Move auth route tests to auth folder 2016-03-18 07:55:19 -05:00
Blade Barringer cd6ab23106 Merge pull request #6900 from doyler/develop
Note about weekly progress update (fixes #6884)
2016-03-18 07:37:32 -05:00
Blade Barringer 4cb652dca4 Merge pull request #6889 from crookedneighbor/add_debug_scripts
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-18 07:36:27 -05:00
Blade Barringer 5c3c8ebb74 refactor: Move auth update routes from user to auth controller 2016-03-18 07:35:29 -05:00
Blade Barringer d1af7adff6 refactor: Update user update routes to be under auth namespace 2016-03-18 07:35:14 -05:00
Blade Barringer 22d25f8be3 fix: Change update user routes to use PUT instead of POST 2016-03-18 07:35:14 -05:00
Blade Barringer 22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug
Inventory sorting debug
2016-03-18 07:33:45 -05:00
Matteo Pagliazzi 6d14b9d5c5 move preening tests to correct location 2016-03-18 02:59:17 +01:00
Alys fb338a00cb prevent quests being started in guilds 2016-03-18 08:38:32 +10:00
Blade Barringer de2f9eb28b Update tests to us set by default 2016-03-17 17:28:46 -05:00
Victor Piousbox 4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Sabe Jones ccdbdb2969 fix(seasonal-shop): choose quest more precisely 2016-03-17 13:13:21 -04:00
Sabe Jones 10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones 4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Sabe Jones 816ef00378 Merge pull request #6890 from khipkin/new_party_badges
add tests for awarding party {up,on} achievs
2016-03-17 11:05:20 -05:00
Blade Barringer e056a62af0 refactor: Setup middleware for all development routes 2016-03-17 09:24:29 -05:00
Blade Barringer 6921c1694a feat: Allow routes to not need an async handler 2016-03-17 09:24:29 -05:00
Keith Holliday 6184fb5d24 Added development controller, middleware, and initial tests 2016-03-17 09:24:29 -05:00
Matteo Pagliazzi 7c005e7c68 fix typo in tests and increase sleep time 2016-03-17 15:20:41 +01:00
Blade Barringer ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer d4d668a7aa fix: Correct typo in equipment click 2016-03-17 08:09:37 -05:00
Blade Barringer c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
This reverts commit 9d50201180.
2016-03-17 08:09:18 -05:00
Alys 9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
2016-03-17 21:47:29 +10:00
Christopher Giroir cfae524579 Updating button text to GET instead of VIEW 2016-03-16 23:23:36 -07:00
Sabe Jones b4b0d7e89c chore(news): mobile updates Bailey 2016-03-17 00:09:42 -04:00
Kaitlin Hipkin 0ca949b1bb pull initialization of controller into helper method and stub state 2016-03-16 23:50:16 -04:00
Blade Barringer 3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00
Josh Holland 952d9ec929 Quick allocation of attribute points from level-up modal
Resolves #6720.
2016-03-16 22:06:54 -05:00
Kaitlin Hipkin 469ece70c3 clean up party {up,on} tests, add calls to $controller after setup 2016-03-16 22:32:24 -04:00
Blade Barringer a150dbc9ca chore(i18n): update locales 2016-03-16 20:32:15 -05:00
Kaitlin Hipkin a0f65f8b25 emojis now properly displayed in challenge won modal 2016-03-16 20:12:52 -05:00
Kaitlin Hipkin ae92a98037 challenge title on challenge winner's profile supports markdown w/o emojis 2016-03-16 20:12:49 -05:00
doyler 51f3008a20 Note about weekly progress update (fixes #6884) 2016-03-16 22:11:01 +01:00
Kaitlin Hipkin ee09bee1e2 use sandbox.stub instead of sandbox.spy 2016-03-16 00:55:20 -04:00
Blade Barringer be0bcad24b chore(i18n): update locales 2016-03-15 19:51:47 -05:00
Blade Barringer 1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Blade Barringer 146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Blade Barringer 9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington a6fb945120 inventory sorting
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
Kaitlin Hipkin 68c3c2973b cannot spy on an undefined function 2016-03-15 19:49:33 -04:00
Kaitlin Hipkin c0e636dba0 fix spy? 2016-03-15 18:36:36 -04:00