78890012c1
Merge pull request #6305 from markhowson/fix_narrow_guild_desc
...
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06:00
5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
42d1fd93f3
Merge branch 'kylestratis-issue-6043' into develop
2015-11-28 19:41:00 +10:00
7bf5300369
Merge branch 'issue-6043' of https://github.com/kylestratis/habitrpg into kylestratis-issue-6043 and remove redundant $and specifier
...
Conflicts:
migrations/mystery_items.js
2015-11-28 19:07:37 +10:00
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05: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
f67bd384d4
Moved guild leader message down slightly
2015-11-26 18:47:54 +00: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
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00: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
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
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
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
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
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10: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
a380c1aa30
refactor api.daysSince to a cron.js function not exposed on api
2015-11-22 10:48:15 +10:00
2f8b6d68e8
refactor api.startOfDay to a cron.js function not exposed on api
2015-11-22 07:13:44 +10:00
9a76e7a62c
chore(gulp): Add convience task for starting up a test server.
2015-11-21 09:33:29 -06:00
6183fd9e71
refactor api.startOfWeek to a cron.js function not exposed on api
2015-11-21 22:26:05 +10:00
e0784a9791
refactor sanitizeOptions from index.js to cron.js
2015-11-21 22:06:02 +10:00
a73662bab6
refactor api.dayMapping to DAY_MAPPING const, not exposed on api
2015-11-21 20:48:18 +10:00
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
66725a561c
fix(test): Remove only
2015-11-20 13:39:54 -05:00
e5d3e7bc83
fix(test): Linting and coverage
2015-11-20 13:36:41 -05:00
fb17c3ae80
Merge branch 'develop' into sabrecat/modularize-statHelpers
2015-11-20 13:27:25 -05:00
a6fb5790e5
refactor(gulp): Dry out linting task
2015-11-20 07:56:59 -06:00
Sabe Jones