ee7bfece06
Added tests for equipping and unequipping.
2015-12-01 17:58:12 +01:00
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
3d9b2047d0
updated static.styl with less classes
...
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
2015-11-30 22:33:12 +01:00
1643e3dbc6
test(modals): Rehatch scenario
2015-11-30 16:19:12 -05:00
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
c4f3c2b1f4
change website FAQ to link to Overview for New Users on website instead of wiki
2015-12-01 07:08:07 +10:00
a42c671f1f
fix(model): Remove common.inviteParty
...
Per @vIiRuS
2015-11-30 15:48:46 -05:00
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
4663c7cf5e
Added translation functions to task types
2015-11-30 09:26:07 -06:00
ea87784575
tasks-fix-delete-message
2015-11-29 14:30:22 -06:00
6056a59cbe
minor update in the comment section
2015-11-29 19:12:45 +01:00
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01:00
06ee603942
Initialized usr._temp when score function is skipped
2015-11-29 11:11:06 -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
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06: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
6a535277a7
updated tab indent
...
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05:00
37378e8497
once more i try to add it back
2015-11-27 10:28:45 +01:00
a28a167437
merge
2015-11-27 10:25:08 +01:00
ae8153c1f0
Merge branch 'static-page-merch' of https://github.com/danielvancamp/habitrpg into static-page-merch
2015-11-27 10:23:53 +01:00
45f43379b0
added original static.styl again, mistakenly removed it while editing
2015-11-27 10:23:10 +01:00
1f8ae40d9d
updated counter to the real 2 sellers
2015-11-27 10:07:12 +01:00
3a47221d74
added better bootstrap for multiple merchandises
2015-11-27 10:07:12 +01:00
f67bf77143
added guide how to add merchandise
2015-11-27 10:07:12 +01:00
e881ba37e7
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-27 10:07:12 +01:00
a7c05de8e7
added better bootstrap for multiple merchandises
2015-11-27 00:19:52 +01:00
610a555849
added guide how to add merchandise
2015-11-27 00:06:33 +01:00
169a8d9915
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-26 23:51:57 +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
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
274f4ab4d2
Removed css in favor of using inverted glyphicon
2015-11-25 23:44:13 -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
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
Oliver Eyton-Williams