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

1096 Commits

Author SHA1 Message Date
Nick Bunn 0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Blade Barringer ef2a1f5929 chore: Update pageres 
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
 2016-03-23 08:16:39 -05:00
Blade Barringer f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray 369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Matteo Pagliazzi 23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite 
[v3] Added group reject invite route and initial tests
 2016-03-22 22:46:12 +01:00
Keith Holliday da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05: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
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
Keith Holliday a8e4455124 Added group reject invite route and initial tests 2016-03-21 15:42:38 -05:00
Matteo Pagliazzi bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Matteo Pagliazzi 480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +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
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
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 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
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
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 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
Alys fb338a00cb prevent quests being started in guilds 2016-03-18 08:38:32 +10:00
Victor Piousbox 4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07: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
Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Matteo Pagliazzi 219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Matteo Pagliazzi fb6c927ce9 Merge pull request #6886 from HabitRPG/api-v3-port-sleep 
[API v3] Port sleep operation from shared code
 2016-03-15 17:42:26 +01:00
Matteo Pagliazzi 73cb50b01a Merge pull request #6872 from TheHollidayInn/api-v3-delete-challenge-tasks-tests 
Added initial delete challenge tasks tests
 2016-03-15 17:26:39 +01:00
Matteo Pagliazzi b2b4340ee3 change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it 2016-03-15 17:05:07 +01:00
Matteo Pagliazzi 490c6a9ae1 wip(shared): port sleep op 2016-03-15 16:33:44 +01:00
Keith Holliday 534ec07b6a Added tests to ensure challenge member can not delete active challenge task and can delete broken or unlinked challenge task 2016-03-15 10:03:48 -05:00
Matteo Pagliazzi e506864e00 Merge pull request #6877 from HabitRPG/v3-adapt-shared 
Make shared code ready for API v3
 2016-03-13 23:13:00 +01:00
Matteo Pagliazzi 8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Victor Piousbox 0b25720232 cleanup 2016-03-13 14:01:53 -07:00
Victor Piousbox c61b10a6eb resolve conflicts 2016-03-13 10:45:19 -07:00
Victor Piousbox c14f0c4247 update username, password 2016-03-13 10:42:59 -07:00
Victor Piousbox 46322cfd38 update username, password 2016-03-12 23:32:20 -08:00
Keith Holliday c04e53b5a5 Added initial delete challenge tasks tests 2016-03-12 21:00:43 -06:00
Matteo Pagliazzi 13a86c3858 Merge pull request #6869 from TheHollidayInn/api-v3-remove-challenge-checklist-item 
Added initial test for removing challenge checklist item
 2016-03-12 18:08:27 +01:00