Alys
904dd595ed
change Google iap-live for Android mobile app gem purchases, at negue's request
2015-12-03 06:22:59 +10:00
Negue
b337efb01a
raise android gem purchase: 21 instead 20
2015-12-02 20:13:33 +01:00
Blade Barringer
6aa164ab31
chore(i18n): update locales
2015-12-02 07:42:29 -06:00
Sabe Jones
1add0084e8
chore(news): Update Bailey for GX3
2015-12-01 18:27:03 -05:00
Sabe Jones
5b943b4ab9
feat(event): Enable GaymerX armor
2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084
feat(content): Armoire and backgrounds 2015/12
2015-12-01 16:29:22 -05:00
Sabe Jones
483ff8cb67
Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
...
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
Sabe Jones
9366b22fef
Merge pull request #6320 from HabitRPG/sabrecat/fix-rehatch-modal
...
Fix modal display when rehatching pets
2015-12-01 14:16:21 -06:00
Sabe Jones
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
Sabe Jones
1643e3dbc6
test(modals): Rehatch scenario
2015-11-30 16:19:12 -05:00
Sabe Jones
3a20455cda
fix(modals): Rehatch pets
...
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
2015-11-30 16:11:13 -05:00
Alys
c4f3c2b1f4
change website FAQ to link to Overview for New Users on website instead of wiki
2015-12-01 07:08:07 +10:00
Sabe Jones
a42c671f1f
fix(model): Remove common.inviteParty
...
Per @vIiRuS
2015-11-30 15:48:46 -05:00
Sabe Jones
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
Alys
5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
Keith Holliday
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
Alys
42d1fd93f3
Merge branch 'kylestratis-issue-6043' into develop
2015-11-28 19:41:00 +10:00
Alys
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
Sabe Jones
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05: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
Mark Howson
f67bd384d4
Moved guild leader message down slightly
2015-11-26 18:47:54 +00: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 a8a2e3b74ae980eed2717b3152142d9d9c46a368)
2015-11-26 11:22:57 -05:00
Mark Howson
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
Mark Howson
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00:00
Keith Holliday
274f4ab4d2
Removed css in favor of using inverted glyphicon
2015-11-25 23:44:13 -06: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
Oliver Eyton-Williams
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
Oliver Eyton-Williams
9bda5657d2
Fixed syntax for linter.
2015-11-25 12:40:40 +01:00
Oliver Eyton-Williams
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
Sabe Jones
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
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Alys
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
Alys
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
Keith Holliday
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
Amin Arria
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
Phillip Thelen
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
Blade Barringer
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
Blade Barringer
b88a1c98db
Merge branch 'Alys-refactor-cron-time-day-2015-11-21' into develop
2015-11-23 08:04:17 -06:00
