5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05: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
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
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
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
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
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
c419ca8839
Merge pull request #6068 from AminArria/Wrong-max-level-messages
...
Wrong max level messages
2015-10-30 23:21:29 -05:00
2eb6cab2be
Merge pull request #6014 from ahstro/toggle-chevrons
...
Toggle chevron direction
2015-10-30 23:13:51 -05:00
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -04:00
27d1e9c788
feat(event): Habitoween
...
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
22caaa7eda
feat(sharing): More opt outs
...
Also fixes a bug where "Display Now" didn't work for pets with a space in their name.
2015-10-28 17:48:16 -04:00
aad3e5ade6
fix(sharing): Add social service to Inventory
...
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
bd230df0d3
Added rebirthLevel var to remove need of extra translation string
2015-10-28 14:33:45 -04:30
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
1cc7ea872f
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
2015-10-27 19:18:05 +10:00
23059763eb
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
2015-10-27 18:45:30 +10:00
f5d6c92897
chore(news): Exhaust Strike Bailey
2015-10-27 00:24:11 -04:00
4dd368a028
Merge pull request #6082 from anilanar/reroll-syntax-bug
...
fix a minor syntax error when opening reroll modal.
2015-10-26 17:55:16 -05:00
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
78416f68da
fix(sharing): Better social button positioning
2015-10-22 16:00:55 -04:00
Alys