Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,917 Commits 64 Branches 1,256 Tags
219ec01ce9877aa8f07a2bb3a63a9bce71b4876b
Commit Graph

12917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 f55df39fb7 Merge branch 'develop' into api-v3 2016-03-13 23:19:04 +01: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 f7c94ad854 Merge pull request #6875 from piousbox/api-v3-update-username-password-2 
update username, password
 2016-03-13 23:03:17 +01:00
Matteo Pagliazzi f65a7321b7 fix common tests, explictly exclude tests from linting 2016-03-13 23:00:48 +01:00
Matteo Pagliazzi 70df1137a0 fix statsComputed getter 2016-03-13 22:39:14 +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
Matteo Pagliazzi b948fc031f fix typo in common code 2016-03-13 21:12:19 +01: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
Matteo Pagliazzi ce916e31bd Merge pull request #6866 from TheHollidayInn/api-v3-updated-checklist-item 
Added initial checklist item update tests
 2016-03-12 18:07:50 +01:00
Keith Holliday 152f7605cd Added initial test for removing challenge checklist item 2016-03-12 10:55:12 -06:00
Keith Holliday e4124f9e02 Added initial checklist item update tests 2016-03-12 10:38:40 -06:00
Matteo Pagliazzi c02082a200 Merge branch 'develop' into api-v3 2016-03-12 16:00:24 +01:00
Matteo Pagliazzi 2fa361d9ea Merge pull request #6865 from TheHollidayInn/api-v3-challenge-add-checklist-item 
Add initial tests for add checklist item to challenge
 2016-03-12 15:56:32 +01:00
Matteo Pagliazzi 8463abb830 Merge pull request #6853 from TheHollidayInn/api-v3-challenge-tasks-put 
Added initial challenge task update tests
 2016-03-12 14:52:54 +01:00
Keith Holliday 0af912bebb Add initial tests for add checklist item to challenge 2016-03-11 14:19:46 -06:00
Matteo Pagliazzi c6e5e3eb1f Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests 
Added initial challenge model tests
 2016-03-11 19:17:09 +01:00
Matteo Pagliazzi 8ca4a7ce8a Merge pull request #6824 from TheHollidayInn/api-v3-get-challenge-tasks 
Added initial tests for get challenge tasks
 2016-03-11 19:16:51 +01:00
Matteo Pagliazzi 6fa23ae49f make sure to clone drop so original properties do not change 2016-03-11 19:11:46 +01:00
Matteo Pagliazzi 29b6e958c6 fix failing tests 2016-03-11 09:51:59 +01:00
Sabe Jones d28219e90d fix(content): Pfeffernusse typo, again 2016-03-10 17:35:36 -06:00
Sabe Jones d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -06:00
Keith Holliday 61e360a1d8 Added initial challenge task update tests 2016-03-10 15:30:22 -06:00
Matteo Pagliazzi 78c1ee2053 Merge pull request #6858 from crookedneighbor/babel_fix 
Add fix for running in dev and test mode
 2016-03-10 19:38:32 +01:00
Blade Barringer 0f7a730a58 Add fix for running in dev and test mode 2016-03-10 12:16:19 -06:00
Matteo Pagliazzi fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Matteo Pagliazzi a9c9d6d1cc Merge pull request #6834 from HabitRPG/split-shared 
Split shared ops
 2016-03-10 17:34:46 +01:00
Matteo Pagliazzi 05676d834e remove git conflict data 2016-03-10 17:13:13 +01:00
Matteo Pagliazzi c39967767c Merge branch 'develop' into split-shared 2016-03-10 17:00:59 +01:00
Matteo Pagliazzi ec13a34228 Merge pull request #6842 from TheHollidayInn/api-v3-challenge-tasks-get 
Added initial get challenge task by id
 2016-03-10 16:53:14 +01:00
Sabe Jones 2a5011b648 fix(content): don't be clever with quest names 2016-03-09 16:57:43 -06:00
Sabe Jones d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603 
Pet quest March 2016
 2016-03-09 15:11:14 -06:00
Sabe Jones cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Sabe Jones 45b8dbc1a6 feat(content): snails complete 2016-03-09 15:55:22 -05:00
Sabe Jones d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Keith Holliday f96de74abd Added test for incorrect task and id and renamed test file 2016-03-09 10:01:16 -06:00
Blade Barringer 3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Matteo Pagliazzi 582ded4494 disable rate limiting middleware 2016-03-08 23:21:11 +01:00
Sabe Jones f5ea9c5524 fix(analytics): don't log chat messages 2016-03-08 15:19:39 -05:00
Blade Barringer 842d031d5b Merge pull request #6828 from HabitRPG/upgrade_node 
chore: Upgrade node
 2016-03-08 13:09:59 -06:00