5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01: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
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
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05: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
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
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
6a4ab17c56
fix linting and add comment
2015-11-23 21:43:39 +01:00
1bf91030c6
format express-validator errors
2015-11-23 21:34:21 +01:00
4a941deece
remove success field from json responses
2015-11-23 21:04:21 +01:00
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
645095e58f
fix errorHandler tests, add tests for res.respond
2015-11-23 13:28:25 +01:00
7086fbfbd6
add res.respond middleware... and use it in user controller
2015-11-23 13:07:21 +01:00
349122c9a1
add res.respond, fix linting
2015-11-23 13:01:47 +01:00
a26f713e18
misc fixes, add ability to attach local auth to social user
2015-11-23 12:47:15 +01:00
3459b51cef
use throw instead of returning next inside of promises
2015-11-23 10:20:07 +01:00
867efd7078
fix(controller): Adjust next calls to throw errors instead inside promise
2015-11-21 17:01:56 -06:00
d1839b816e
chore(lint): Clean up user model and controller
2015-11-21 16:17:42 -06:00
074b3f5079
fix(controller): Validate params for register route in user controller
2015-11-21 14:57:59 -06:00
75cea0c810
refactor(model): Remove password and passwordConfirmation from user model
2015-11-21 14:56:44 -06:00
43ef4e51b5
fix(model): Remove pre validation from user model
2015-11-21 14:56:20 -06:00
7ce554c578
fix(controller): Correct path to EmailUnsubscription model
2015-11-21 14:41:07 -06:00
5c33a404fb
handle mongoose validation errors, fix bug in import and add more tests for errors
2015-11-21 15:00:31 +01:00
afbfbdd01c
fix mongoose promise, some user validation, tests urls
2015-11-21 14:27:24 +01:00
3608742e20
fix bugs on user controller
2015-11-21 12:26:48 +01:00
444aff7d33
Merge branch 'api-v3' into api-v3-user
2015-11-21 12:11:25 +01:00
041224b5ac
fix merge conflicts
2015-11-21 12:09:40 +01:00
2f4e6e015a
Merge branch 'api-v3-user' of github.com:HabitRPG/habitrpg into api-v3-user
2015-11-21 12:03:26 +01:00
7866f7393b
clean up code, add deleteSocial method
2015-11-21 12:03:08 +01:00
e4827f1b78
fix(user ctrl): Correct path to use model import
2015-11-20 19:08:25 -06:00
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
b286a93006
removed challenge tag maxlength, reduced tag and prize field size
2015-11-19 23:21:15 -05:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
c87200f582
comment out incomplete code
2015-11-19 22:04:18 +01:00
e028af9f3f
add social login / signup and misc fixes
2015-11-19 21:50:23 +01:00
972cbbdaa6
try moving all the logic to the model
2015-11-19 21:09:39 +01:00
55d743ebe5
remove q import
2015-11-19 16:29:22 +01:00
5874e89e2a
simplify code
2015-11-19 16:22:16 +01:00
Matteo Pagliazzi