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

1235 Commits

Author SHA1 Message Date
Matteo Pagliazzi 62708d4365 cleanup 2015-12-02 11:30:58 +01:00
Matteo Pagliazzi 427c805ea5 fix user tests and misc changes 2015-12-02 11:22:53 +01:00
Matteo Pagliazzi 93fcc7957e fix trying to move completed todos 2015-11-30 20:22:22 +01:00
Matteo Pagliazzi 67bcfde6dc implement move task 2015-11-30 20:14:53 +01:00
Matteo Pagliazzi ebdfe4c49b add checklists routes 2015-11-30 17:25:40 +01:00
Matteo Pagliazzi 3002db3d75 add ability to update tasks, can pass additional fields to Model.sanitize at runtime 2015-11-29 19:05:24 +01:00
Matteo Pagliazzi 6c904330e7 misc fixes, add createTask route and ability to get tasks by type to getTasks route 2015-11-28 17:47:32 +01:00
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Alys 9f53365648 add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304) 2015-11-27 06:13:14 +10:00
Sabe Jones 5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix 
Two-handed weapons no longer automatically equip unless desired. fixes #6231
 2015-11-26 10:53:50 -06:00
Sabe Jones 9cbe94c602 chore(gulp): compile sprites 2015-11-26 11:25:25 -05:00
Daniel Van Camp 98a62c5cc9 fix the phoenix base on the right place now 
(cherry picked from commit a8a2e3b74a)
 2015-11-26 11:22:57 -05:00
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Sabe Jones 9671f4a09d feat(event): November sprites 2015-11-25 13:33:36 -06:00
Oliver Eyton-Williams 707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Alys 69553260d3 revert refactor of preenHistory 2015-11-24 08:24:33 +10:00
Amin Arria 671d4aaecc Change timezone text 2015-11-23 11:38:26 -04:30
Blade Barringer 7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Matteo Pagliazzi a26f713e18 misc fixes, add ability to attach local auth to social user 2015-11-23 12:47:15 +01:00
Alys 65c276c477 fix formatting in preenHistory 2015-11-22 21:08:51 +10:00
Alys 1082bb1f81 refactor preenHistory from index.js to cron.js 2015-11-22 15:52:30 +10:00
Alys 83ea085c21 refactor api.shouldDo and associated code; fix new bug in sanitizeOptions() 2015-11-22 11:28:51 +10:00
Alys 728a94d199 improve coding style 2015-11-22 11:05:03 +10:00
Alys a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys 2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Alys 6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys e0784a9791 refactor sanitizeOptions from index.js to cron.js 2015-11-21 22:06:02 +10:00
Matteo Pagliazzi 7866f7393b clean up code, add deleteSocial method 2015-11-21 12:03:08 +01:00
Alys a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Matteo Pagliazzi 972cbbdaa6 try moving all the logic to the model 2015-11-19 21:09:39 +01:00
Matteo Pagliazzi 6451264572 start porting register local user handler, several bug fixes 2015-11-19 12:13:54 +01:00
Sabe Jones 72ea9426dd fix(lint): Space infix operator (?) 2015-11-18 15:18:44 -05:00
Sabe Jones ed443b490a refactor(constant): Screaming camel MAX_LEVEL 2015-11-18 15:14:47 -05:00
Sabe Jones 31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Matteo Pagliazzi d5d13477d7 wip user controllers: local login method 2015-11-18 18:02:35 +01:00
Blade Barringer 627da76b49 Merge branch 'develop' into api-v3 2015-11-18 09:09:49 -06:00
Blade Barringer f94394127a Remove unused var 2015-11-18 08:00:14 -06:00
Blade Barringer 9e557c43d3 Fix bug where seasonal items could not be purchased. 2015-11-18 07:58:01 -06:00
Blade Barringer 26b82dff4b Fix bug where armoire items could not be repurchased. 2015-11-18 07:57:45 -06:00
Oliver Eyton-Williams cae267c0fa Two-handed weapons no longer automatically equip unless desired. 2015-11-18 11:59:31 +01:00
Blade Barringer 08c4ec5557 Merge branch 'develop' into api-v3 2015-11-17 23:15:15 -06:00
Blade Barringer 94bf181301 Add noscript locales 2015-11-17 22:02:57 -06:00
Blade Barringer 0a7d7fc42d Merge pull request #6251 from crookedneighbor/modularize-content-gear 
Pull out gear into separate modules
 2015-11-17 21:57:13 -06:00
Blade Barringer 4d415ee9c1 chore(i18n): update locales 2015-11-17 21:54:30 -06:00
Blade Barringer fba35ea491 chore(i18n): update locales 2015-11-17 21:48:55 -06:00
Blade Barringer 6bd0ed76cc Fixes #6524. Correct spelling of community 2015-11-17 21:41:06 -06:00
Blade Barringer 71473a93ad chore(i18n): update locales 2015-11-17 21:38:32 -06:00
Blade Barringer 1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00