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
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
1826cf2784
Merge pull request #6266 from HabitRPG/api-v3-user
...
[API v3] User controller
2015-11-23 21:52:32 +01: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
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
093970b48a
Merge branch 'api-v3' into api-v3-user
2015-11-23 08:51:30 -06:00
8196c65627
fix(api tests): Let api test script pass the correct api version for helper.
...
(cherry picked from commit 2fa2e0f483
2015-11-23 08:48:24 -06:00
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
b88a1c98db
Merge branch 'Alys-refactor-cron-time-day-2015-11-21' into develop
2015-11-23 08:04:17 -06: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
6d238a0770
fix .eslintrc
2015-11-23 10:09:17 +01:00
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
dcfd7eb6d0
Merge pull request #6274 from crookedneighbor/api-v3-user-local-spike
...
Api v3 user local spike
2015-11-22 11:59:28 +01:00
1082bb1f81
refactor preenHistory from index.js to cron.js
2015-11-22 15:52:30 +10:00
83ea085c21
refactor api.shouldDo and associated code; fix new bug in sanitizeOptions()
2015-11-22 11:28:51 +10:00
728a94d199
improve coding style
2015-11-22 11:05:03 +10:00
Matteo Pagliazzi