c2ba90afcc
tests(fix): Add return to expect promise in create task test
2015-12-04 09:13:50 -06:00
1e9386f7b6
create model for tags, add routes
2015-12-04 14:47:02 +01:00
a6648fc638
add tags routes, misc fixes
2015-12-03 19:19:53 +01:00
c0a99eec8b
fix user model, sanitize some fields on task creation, add some tests and comments
2015-12-03 18:15:22 +01:00
506609cc29
starts writing tests for tasks, fix errors in auth middleware and tasks methods
2015-12-03 17:48:32 +01:00
62708d4365
cleanup
2015-12-02 11:30:58 +01:00
427c805ea5
fix user tests and misc changes
2015-12-02 11:22:53 +01:00
fde47bdc90
add ability to get completed todos (only 30 for now)
2015-11-30 21:00:09 +01:00
93fcc7957e
fix trying to move completed todos
2015-11-30 20:22:22 +01:00
67bcfde6dc
implement move task
2015-11-30 20:14:53 +01:00
1bd794b5e3
simplify tasks naming
2015-11-30 19:38:53 +01:00
ebdfe4c49b
add checklists routes
2015-11-30 17:25:40 +01:00
3002db3d75
add ability to update tasks, can pass additional fields to Model.sanitize at runtime
2015-11-29 19:05:24 +01:00
5291753841
prevent the deletion of challenge tasks
2015-11-29 18:29:35 +01:00
6849fd49be
add ability to remove a task
2015-11-29 17:47:10 +01:00
454aa3731c
add tasks to user.tasksOrder or creation
2015-11-28 18:18:28 +01:00
c2dac2c494
fix import paths
2015-11-28 18:05:07 +01:00
6c904330e7
misc fixes, add createTask route and ability to get tasks by type to getTasks route
2015-11-28 17:47:32 +01:00
786845effd
fix tour/tutorial on signup
2015-11-28 14:07:33 +01:00
90d7f1f6a8
improve tasks models, fix a part of user pre save, rename auth controller
2015-11-28 13:46:53 +01:00
58d87887e6
fix linting
2015-11-27 21:28:49 +01:00
cfa776fff3
starts fixing default tasks and use discriminator
2015-11-27 21:18:37 +01:00
7d53a4fd54
port task model to es6 and implement discriminators
2015-11-27 19:06:26 +01:00
9adfd6311f
fix merge conflict
2015-11-27 17:09:01 +01:00
5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01:00
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
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
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
846b6597ab
Merge pull request #6280 from vIiRuS/patch-6
...
Store inviteParty coachmark for iOS app
2015-11-26 11:45:33 -06:00
0a90c7c66d
Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
...
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06:00
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
9cbe94c602
chore(gulp): compile sprites
2015-11-26 11:25:25 -05:00
98a62c5cc9
fix the phoenix base on the right place now
...
(cherry picked from commit a8a2e3b74a
2015-11-26 11:22:57 -05:00
99f6ac8f1a
Merge pull request #6290 from HabitRPG/api-v3-baseModel
...
[API v3] [WIP] Base model plugin
2015-11-26 16:19:08 +01:00
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
5461345770
remove trailing whitespace
2015-11-26 08:49:40 +10:00
83934bf5c9
Added markdown directive to challenge titles
2015-11-26 08:49:40 +10:00
e429be7046
Merge pull request #6293 from HabitRPG/sabrecat/fix-mount-modal
...
Show mount modal more often
2015-11-25 16:24:05 -06:00
863f416514
Merge pull request #6303 from HabitRPG/sabrecat/thanksgiving
...
Habitica Thanksgiving event
2015-11-25 16:23:09 -06:00
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
d67836ee1f
allow for additional transform functions for toJSON and sanitize
2015-11-25 15:42:29 +01:00
94fc1c9bef
baseModel: delete properties instead of setting them to undefined, transform toJSON only not toObject
2015-11-25 15:19:21 +01:00
77d25ddc32
correctly add _id default
2015-11-25 13:43:34 +01:00
9bda5657d2
Fixed syntax for linter.
2015-11-25 12:40:40 +01:00
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
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
3f1faf113e
add baseModel plugin with some tests
2015-11-24 18:51:48 +01:00
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Blade Barringer