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

13027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 861a32f72a feat(achievements): move party cheevos to server 2016-03-27 14:51:39 -04:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +01:00
Matteo Pagliazzi 85a05e0a99 Merge pull request #6938 from piousbox/api-v3-test-local-login-2 
local login test
 2016-03-21 22:50:37 +01:00
Matteo Pagliazzi f04d8d4d97 do not remove ops/fns from common/script/index.js until they have been ported everywhere 2016-03-21 22:50:18 +01:00
Victor Piousbox a03f34362c resolving conflicts 2016-03-21 21:28:07 +00:00
Victor Piousbox b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00:00
Victor Piousbox 5426d63a36 local login test 2016-03-21 21:26:04 +00:00
Matteo Pagliazzi d6fa16f86c skip tests that cannot be stubbed correctly 2016-03-21 22:22:26 +01:00
Victor Piousbox ddbb8a1beb invalid login credentials fixes 2016-03-21 21:10:17 +00:00
Matteo Pagliazzi 1d3c67af40 Merge pull request #6937 from piousbox/api-v3-delete-social-auth-test 
Api v3 delete social auth test
 2016-03-21 21:28:59 +01:00
Victor Piousbox fa079bd764 added those awaits for DELETE social user testing 2016-03-21 18:35:00 +00:00
Victor Piousbox 5f5fc754b0 local login test 2016-03-21 05:48:37 +00:00
Victor Piousbox 363e23b5e0 Merge branch 'api-v3-delete-social-auth-test' of github.com:piousbox/habitrpg into api-v3-delete-social-auth-test 2016-03-21 04:53:40 +00:00
Victor Piousbox ebcf913676 strengthen the test of password-reset just a little 2016-03-21 04:49:29 +00:00
Matteo Pagliazzi 0b5506b16b Merge pull request #6908 from piousbox/api-v3-password-reset 
api-v3 password reset
 2016-03-20 22:32:32 +01:00
Matteo Pagliazzi bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Victor Piousbox f73141f1f6 strengthen the test of password-reset just a little 2016-03-20 19:00:23 +00:00
Matteo Pagliazzi 480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +01:00
Matteo Pagliazzi fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01:00
Matteo Pagliazzi 657f19af0d add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy 2016-03-20 13:46:56 +01:00
Matteo Pagliazzi 2560096466 port buyQuest tests 2016-03-20 13:33:34 +01:00
Matteo Pagliazzi ad8834f4ed port tests for shared.ops.buyMysterySet.js 2016-03-20 13:12:06 +01:00
Matteo Pagliazzi 71f304786c add pickDeep utility function to pick nested properties from objects 2016-03-20 13:07:14 +01:00
Victor Piousbox ebbca3276e revert email.send() 2016-03-20 03:29:12 +00:00
Victor Piousbox 99cb8a07f7 reset password route 2016-03-20 02:54:52 +00:00
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
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