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

2409 Commits

Author SHA1 Message Date
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
Matteo Pagliazzi 7c005e7c68 fix typo in tests and increase sleep time 2016-03-17 15:20:41 +01: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
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 29b6e958c6 fix failing tests 2016-03-11 09:51:59 +01: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
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 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 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 d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05: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
Keith Holliday 22e64bb88e Added initial get challenge task by id 2016-03-08 12:42:05 -06:00
Lucas Torroba d502db71e5 Changed tavern tier 1 text icon 
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
 2016-03-08 03:05:46 -03:00
Phillip Thelen 36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01:00
Alys 34057c375b Merge pull request #6819 from zesme/develop 
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
 2016-03-06 20:28:47 +10:00
Alys 87bd55cca1 Merge pull request #6780 from colwem/issue6774 
Improve styling of markdown blockquotes - fixes #6774
 2016-03-06 19:59:30 +10:00
Alys e59f614568 Merge pull request #6786 from murraybd/use-level-style-in-modals 
Use level style in modals
 2016-03-06 18:52:21 +10:00
Alys 9cac8dd95e Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740 
Fixed partially hidden button in chat box
 2016-03-06 18:18:02 +10:00
Alys 612d455fe1 Merge pull request #6782 from andrewcham/issue6779 
update community guidelines - fixes #6779
 2016-03-06 17:42:08 +10:00
Matteo Pagliazzi b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
Matteo Pagliazzi 6830a4464a Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3 2016-03-05 19:24:11 +01:00
Matteo Pagliazzi 863ca9954e errors working with babel 6, export v3 shared modules in main common module 2016-03-05 18:58:40 +01:00
Blade Barringer b553a6c134 fix: Remove active handles (incompatible with node v4) 2016-03-05 08:11:21 -06:00