Commit Graph

1894 Commits

Author SHA1 Message Date
Matteo Pagliazzi c0a99eec8b fix user model, sanitize some fields on task creation, add some tests and comments 2015-12-03 18:15:22 +01:00
Matteo Pagliazzi 506609cc29 starts writing tests for tasks, fix errors in auth middleware and tasks methods 2015-12-03 17:48:32 +01:00
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 fde47bdc90 add ability to get completed todos (only 30 for now) 2015-11-30 21:00:09 +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 1bd794b5e3 simplify tasks naming 2015-11-30 19:38: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 5291753841 prevent the deletion of challenge tasks 2015-11-29 18:29:35 +01:00
Matteo Pagliazzi 6849fd49be add ability to remove a task 2015-11-29 17:47:10 +01:00
Matteo Pagliazzi 454aa3731c add tasks to user.tasksOrder or creation 2015-11-28 18:18:28 +01:00
Matteo Pagliazzi c2dac2c494 fix import paths 2015-11-28 18:05:07 +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 786845effd fix tour/tutorial on signup 2015-11-28 14:07:33 +01:00
Matteo Pagliazzi 90d7f1f6a8 improve tasks models, fix a part of user pre save, rename auth controller 2015-11-28 13:46:53 +01:00
Matteo Pagliazzi 58d87887e6 fix linting 2015-11-27 21:28:49 +01:00
Matteo Pagliazzi cfa776fff3 starts fixing default tasks and use discriminator 2015-11-27 21:18:37 +01:00
Matteo Pagliazzi 7d53a4fd54 port task model to es6 and implement discriminators 2015-11-27 19:06:26 +01:00
Matteo Pagliazzi 9adfd6311f fix merge conflict 2015-11-27 17:09:01 +01:00
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Sabe Jones ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop
Conflicts:
	website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
Sabe Jones 3c672ea814 Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
Sabe Jones 846b6597ab Merge pull request #6280 from vIiRuS/patch-6
Store inviteParty coachmark for iOS app
2015-11-26 11:45:33 -06:00
Sabe Jones 0a90c7c66d Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06:00
Alys 0c77737f36 Merge pull request #6299 from ojeytonwilliams/static-string-fix
Fixed broken string reference and centered the string.
2015-11-26 08:59:03 +10:00
Alys 5461345770 remove trailing whitespace 2015-11-26 08:49:40 +10:00
Keith Holliday 83934bf5c9 Added markdown directive to challenge titles 2015-11-26 08:49:40 +10:00
Sabe Jones e429be7046 Merge pull request #6293 from HabitRPG/sabrecat/fix-mount-modal
Show mount modal more often
2015-11-25 16:24:05 -06:00
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams d385b2e415 Fixed broken string reference and centered the string. 2015-11-25 15:46:59 +01:00
Matteo Pagliazzi d67836ee1f allow for additional transform functions for toJSON and sanitize 2015-11-25 15:42:29 +01:00
Matteo Pagliazzi 94fc1c9bef baseModel: delete properties instead of setting them to undefined, transform toJSON only not toObject 2015-11-25 15:19:21 +01:00
Matteo Pagliazzi 77d25ddc32 correctly add _id default 2015-11-25 13:43:34 +01:00
Sabe Jones 28205663e4 fix(modals): Show mount modal more often
Fixes #6288. Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
Matteo Pagliazzi 3f1faf113e add baseModel plugin with some tests 2015-11-24 18:51:48 +01:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information
Timezone information
2015-11-24 21:21:10 +10:00
Alys 431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10:00
Matteo Pagliazzi 6a4ab17c56 fix linting and add comment 2015-11-23 21:43:39 +01:00
Matteo Pagliazzi 1bf91030c6 format express-validator errors 2015-11-23 21:34:21 +01:00
Matteo Pagliazzi 4a941deece remove success field from json responses 2015-11-23 21:04:21 +01:00
Keith Holliday b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Phillip Thelen 743e7cbebd store inviteParty coachmark for iOS app 2015-11-23 16:24:46 +01:00
Matteo Pagliazzi 645095e58f fix errorHandler tests, add tests for res.respond 2015-11-23 13:28:25 +01:00
Matteo Pagliazzi 7086fbfbd6 add res.respond middleware... and use it in user controller 2015-11-23 13:07:21 +01:00
Matteo Pagliazzi 349122c9a1 add res.respond, fix linting 2015-11-23 13:01:47 +01:00
Matteo Pagliazzi a26f713e18 misc fixes, add ability to attach local auth to social user 2015-11-23 12:47:15 +01:00
Matteo Pagliazzi 3459b51cef use throw instead of returning next inside of promises 2015-11-23 10:20:07 +01:00
Blade Barringer 867efd7078 fix(controller): Adjust next calls to throw errors instead inside promise 2015-11-21 17:01:56 -06:00