Daniel Van Camp
3c7ddf8df1
Merge branch 'develop' into static-page-merch
2015-12-14 21:27:50 +01:00
Blade Barringer
5fa91713f5
fix(favicon): Add 192x192 image
2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6
Merge branch 'develop' into anilanar-favicon192
2015-12-12 20:08:34 -06:00
Blade Barringer
81067efd19
Merge branch 'joyclark-new_mount_heads' into develop
2015-12-12 17:16:36 -06:00
Alys
10a63a6cb7
make Android link in footer open in new tab
2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6
change Android link in footer to point to Google Play
2015-12-12 18:33:36 +10:00
Alys
5d6c4d4dcd
add Android app with Google Play logo to static apps page; remove mailing list signup form
2015-12-12 11:32:17 +10:00
Sabe Jones
f6cdf5d257
chore(news): Android Bailey
2015-12-10 17:00:48 -05:00
Joy Clark
7628882f24
use new css class
2015-12-08 13:22:13 +01:00
Sabe Jones
0f578b79ff
feat(pets): Peppermint Hatching Potions
...
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Alys
d63cf64944
allow Fetch Recent Messages button to appear on newly-created groups
2015-12-03 10:03:59 +10:00
Sabe Jones
1add0084e8
chore(news): Update Bailey for GX3
2015-12-01 18:27:03 -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
Daniel Van Camp
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
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
Daniel Van Camp
6056a59cbe
minor update in the comment section
2015-11-29 19:12:45 +01:00
Daniel Van Camp
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01: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
Daniel Van Camp
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
Daniel Van Camp
a28a167437
merge
2015-11-27 10:25:08 +01:00
Daniel Van Camp
ae8153c1f0
Merge branch 'static-page-merch' of https://github.com/danielvancamp/habitrpg into static-page-merch
2015-11-27 10:23:53 +01:00
Daniel Van Camp
1f8ae40d9d
updated counter to the real 2 sellers
2015-11-27 10:07:12 +01:00
Daniel Van Camp
3a47221d74
added better bootstrap for multiple merchandises
2015-11-27 10:07:12 +01:00
Daniel Van Camp
f67bf77143
added guide how to add merchandise
2015-11-27 10:07:12 +01:00
Daniel Van Camp
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
Daniel Van Camp
a7c05de8e7
added better bootstrap for multiple merchandises
2015-11-27 00:19:52 +01:00
Daniel Van Camp
610a555849
added guide how to add merchandise
2015-11-27 00:06:33 +01:00
Daniel Van Camp
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
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
0a90c7c66d
Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
...
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06: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
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Keith Holliday
b668829d85
Added ability to invert pushToBottom when holding down ctrl or cmd button
2015-11-22 15:57:14 -06:00
Arodang
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
arodang
b286a93006
removed challenge tag maxlength, reduced tag and prize field size
2015-11-19 23:21:15 -05:00
Sabe Jones
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
Alys
cb1f745d39
Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
...
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
2015-11-19 07:09:14 +10:00
Blade Barringer
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
Blade Barringer
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
Gautham Chandra
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
