Commit Graph

11974 Commits

Author SHA1 Message Date
Matteo Pagliazzi 955b0f042b fix tests 2015-12-06 17:07:29 +01:00
Matteo Pagliazzi cb08c383b9 misc fixes, add tests for some tasks routes 2015-12-06 16:51:18 +01:00
Blade Barringer 8a872bd8c0 tests: Add pending tests for scoring tasks 2015-12-04 11:12:25 -06:00
Blade Barringer 834ae123e8 tests: Add pending test for GET /tasks 2015-12-04 10:56:54 -06:00
Blade Barringer 431fc571fa tests: Add pending tests for getting a specific task in v3 2015-12-04 10:55:15 -06:00
Blade Barringer 5aca166837 tests: Add delete task integration test for v3 2015-12-04 10:50:41 -06:00
Blade Barringer 1a2cda0835 tests: Add additional pending tests 2015-12-04 10:39:20 -06:00
Blade Barringer 49cc6db05b tests(tasks): Rename test to conform to route style 2015-12-04 10:25:27 -06:00
Blade Barringer b0bcfff12d tests(tasks): Add pending tests for create task test 2015-12-04 10:24:40 -06:00
Blade Barringer c2ba90afcc tests(fix): Add return to expect promise in create task test 2015-12-04 09:13:50 -06:00
Matteo Pagliazzi 1e9386f7b6 create model for tags, add routes 2015-12-04 14:47:02 +01:00
Matteo Pagliazzi a6648fc638 add tags routes, misc fixes 2015-12-03 19:19:53 +01:00
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
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 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
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
Matteo Pagliazzi 99f6ac8f1a Merge pull request #6290 from HabitRPG/api-v3-baseModel
[API v3] [WIP] Base model plugin
2015-11-26 16:19:08 +01: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 863f416514 Merge pull request #6303 from HabitRPG/sabrecat/thanksgiving
Habitica Thanksgiving event
2015-11-25 16:23:09 -06: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