Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,152 Commits 64 Branches 1,256 Tags
4d28eea6e2ee8f0590d3fde165900a743f65942e
Commit Graph

13152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Piousbox 6d972ea9af resolving conflicts 2016-03-20 02:53:58 +00:00
Victor Piousbox 3784f68dd8 mock for emailer for resetPassword route 2016-03-20 02:32:55 +00:00
Victor Piousbox d2c1c2cec6 cleanup and moving text strings to a locale object 2016-03-19 17:37:08 +00:00
Victor Piousbox e9a355a60b tests pass 2016-03-19 10:13:44 -07:00
Matteo Pagliazzi 957e1d26d6 add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy 2016-03-19 18:05:02 +01:00
Matteo Pagliazzi ff72706cae wip(shared): port buy ops and linked fns 2016-03-19 16:04:27 +01:00
Matteo Pagliazzi e68ebee980 temporarily skip challenge task deletion test 2016-03-19 13:10:40 +01:00
Matteo Pagliazzi 0a906da50c Merge pull request #6918 from TheHollidayInn/api-v3-challenge-task-score-tests 
Added tests for challenge task scoring and moved scoring code to model
 2016-03-19 12:08:37 +01:00
Kaitlin Hipkin 9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
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
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