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

949 Commits

Author SHA1 Message Date
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
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 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
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 cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -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
Keith Holliday 22e64bb88e Added initial get challenge task by id 2016-03-08 12:42:05 -06:00
Phillip Thelen 36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01: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
Victor Piousbox 7dfdbb8b05 /user/update-email endpoint 2016-03-04 21:27:16 +00:00
Blade Barringer b97511db31 fix: Use module.exports instead of export default 2016-03-04 13:29:51 -06:00
Blade Barringer 4cd0428f0a Merge branch 'develop' into api-v3 2016-03-04 12:16:22 -06:00
Keith Holliday bcc4d568df Moved unlinkChallengeTasks to challenge model and added tests 2016-03-04 11:45:21 -06:00
Blade Barringer 511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel 
chore: upgrade babel to v6
 2016-03-04 08:36:08 -06:00
Blade Barringer 9447a6ce10 feat: pre-compile babel when used in production 2016-03-04 07:44:22 -06:00
Phillip Thelen a1e1ac211f improve improvement category validation 2016-03-04 14:00:26 +01:00
Blade Barringer 99242ac60f fix: remove dependency that was causing build to fail 2016-03-03 22:24:55 -06:00
Matteo Pagliazzi d85c64705e Merge branch 'develop' into api-v3 2016-03-03 21:15:16 +01:00
Sabe Jones ea983179a4 Merge pull request #6804 from HabitRPG/sabrecat/active-handles 
Active handles logging
 2016-03-03 13:55:14 -06:00
Matteo Pagliazzi 96c582e062 fix tests, move most errors to shared code 2016-03-03 19:16:03 +01:00
Blade Barringer 0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Matteo Pagliazzi 80f791c86b add tests, move CustomError to common, fix casting 2016-03-03 00:16:28 +01:00
Sabe Jones af38e83e36 fix(logging): don't log without env var 2016-03-02 11:30:49 -05:00
Sabe Jones c761944c35 feat(logging): timestamp active handles output 2016-03-02 10:22:46 -05:00
Matteo Pagliazzi 05b6e25c28 port spells to api-v3 2016-03-02 13:05:17 +01:00
Matteo Pagliazzi 8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01:00
Alys f69a29c152 improve group invitation code and tests 2016-03-02 09:26:55 +10:00
Sabe Jones a698559c04 fix(log-handles): don't log verbose code 2016-03-01 16:46:39 -05:00
Sabe Jones bff5258a56 fix(logging): get interval from env var 2016-03-01 16:46:39 -05:00
Sabe Jones 078100aac8 chore(logging): output active handles per 10 minutes 2016-03-01 16:46:38 -05:00
Keith Holliday 20621b940e Added better tests to ensure tasks are synced 2016-03-01 14:38:09 -06:00
Matteo Pagliazzi 531d3969f4 fix cluster.fork 2016-03-01 09:15:13 +01:00
Matteo Pagliazzi e5224a7b2a add support for user._tmp, disable user.filters since it is not used 2016-02-29 23:20:13 +01:00