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
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
0a90c7c66d
Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
...
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06: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
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
b286a93006
removed challenge tag maxlength, reduced tag and prize field size
2015-11-19 23:21:15 -05:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
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
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
f5f33bd1b9
fix(modals): SM modal fixes
...
Fixes #6253 , allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042 .
2015-11-17 16:56:11 -05:00
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
b87592c8a7
Changed p blocks to single line
2015-11-15 23:00:44 -04:30
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
807726305f
Added timezone form
2015-11-12 19:27:25 -04:30
efd0e2333e
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
...
User can now check out of inn from tasks page
2015-11-11 20:49:35 -06:00
f0a484bbe1
fix(strings): Variable population count
2015-11-11 21:10:24 -05:00
52f9f03afb
fix(news): Link to Teespring storefront
2015-11-11 20:19:48 -05:00
83b61f9aa3
Merge branch 'develop' into sabrecat/pet-201511
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-11-11 18:36:25 -05:00
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
cc92b985a2
fix(sharing): Translatable share strings
2015-11-11 13:35:14 -05:00
cc2a6d4db1
fix(sharing): Push ng-binding into Jade
2015-11-11 13:09:00 -05:00
63f00d3643
fix(sharing): Better Tweet syntax
...
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
2015-11-10 17:07:34 -05:00
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
875f2ac552
feat(sharing): More achievements
2015-11-10 00:08:17 -05:00
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
b9b2536478
User can now check out of inn from tasks page
...
Fixes #5651
2015-11-07 18:32:19 -05:00
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
18c2279be4
fix(overview): Wording and layout tweaks
2015-11-05 14:18:51 -05:00
bb55a74f48
chore(news): iOS update Bailey
...
Also fixes the color of the iOS app icon and codes it more intelligently.
2015-11-05 11:48:51 -05:00
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
df7e0236c2
fix(static): Improved /apps layout
2015-11-04 15:30:42 -05:00
Sabe Jones