Sabe Jones
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
Sabe Jones
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
Sabe Jones
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
Sabe Jones
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
Oliver Eyton-Williams
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
Amin Arria
b87592c8a7
Changed p blocks to single line
2015-11-15 23:00:44 -04:30
Gautham Chandra
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
Gautham Chandra
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
Gautham Chandra
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
Amin Arria
807726305f
Added timezone form
2015-11-12 19:27:25 -04:30
Blade Barringer
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
Sabe Jones
f0a484bbe1
fix(strings): Variable population count
2015-11-11 21:10:24 -05:00
Sabe Jones
52f9f03afb
fix(news): Link to Teespring storefront
2015-11-11 20:19:48 -05:00
Sabe Jones
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
Sabe Jones
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
Sabe Jones
cc92b985a2
fix(sharing): Translatable share strings
2015-11-11 13:35:14 -05:00
Sabe Jones
cc2a6d4db1
fix(sharing): Push ng-binding into Jade
2015-11-11 13:09:00 -05:00
Sabe Jones
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
Sabe Jones
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
Sabe Jones
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
Sabe Jones
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
Sabe Jones
875f2ac552
feat(sharing): More achievements
2015-11-10 00:08:17 -05:00
Sabe Jones
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
Gautham Chandra
b9b2536478
User can now check out of inn from tasks page
...
Fixes #5651
2015-11-07 18:32:19 -05:00
Sabe Jones
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
Sabe Jones
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
Sabe Jones
18c2279be4
fix(overview): Wording and layout tweaks
2015-11-05 14:18:51 -05:00
Sabe Jones
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
Sabe Jones
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
Sabe Jones
df7e0236c2
fix(static): Improved /apps layout
2015-11-04 15:30:42 -05:00
Sabe Jones
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
Blade Barringer
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
Amin Arria
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
Amin Arria
5278a08c93
Added horizontal line
2015-11-03 22:32:23 -04:30
Amin Arria
7342735b1b
Fix error missing web in webStep
2015-11-03 22:18:41 -04:30
Amin Arria
f79110d6d2
Changed to be more like the FAQ
2015-11-03 22:03:24 -04:30
Sabe Jones
caa4170f12
fix(sharing): Wording tweaks
2015-11-03 17:19:57 -05:00
Sabe Jones
02abee9f4e
fix(sharing): Landing page tweaks
2015-11-03 16:16:17 -05:00
Sabe Jones
0260ea3fcd
WIP(sharing): Draft functional landing page
2015-11-03 15:04:31 -05:00
Sabe Jones
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
Amin Arria
167af1afd4
New static page: overview
2015-11-03 13:35:14 -04:30
Blade Barringer
24480e5f04
Merge branch 'develop' into srrvnn-develop
2015-11-03 07:31:48 -06:00
Sabe Jones
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
Blade Barringer
0894a3ea2d
Merge branch 'develop' into srrvnn-develop
2015-11-02 06:45:45 -06:00
Sabe Jones
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
Blade Barringer
c419ca8839
Merge pull request #6068 from AminArria/Wrong-max-level-messages
...
Wrong max level messages
2015-10-30 23:21:29 -05:00
Blade Barringer
2eb6cab2be
Merge pull request #6014 from ahstro/toggle-chevrons
...
Toggle chevron direction
2015-10-30 23:13:51 -05:00
Blade Barringer
add761e58e
Remove extraneous div
2015-10-30 23:05:19 -05:00
Blade Barringer
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
Thrashmandicoot
76de8af848
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 20:02:16 -07:00
Thrashmandicoot
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
Blade Barringer
d37450622c
Create a social layout
2015-10-30 18:41:46 -05:00
Sabe Jones
0c5e520e6f
WIP(sharing): Incomplete landing page
...
First stab at creating landing pages for inbound social traffic. May need a different solution.
2015-10-30 17:35:30 -04:00
Sabe Jones
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
Sabe Jones
68660b3043
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
...
WIP: Habitoween
2015-10-30 14:46:44 -05:00
Sabe Jones
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
Thrashmandicoot
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
Thrashmandicoot
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
Thrashmandicoot
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
Sabe Jones
d3a6ff5b2d
fix(front-page): Remove extra script tag
...
Why did I even do that?
2015-10-29 17:07:41 -04:00
Sabe Jones
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -04:00
Sabe Jones
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
Blade Barringer
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
Blade Barringer
68fabbf56f
Update names
2015-10-29 08:07:06 -05:00
Sabe Jones
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
Sabe Jones
aad3e5ade6
fix(sharing): Add social service to Inventory
...
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
Sabe Jones
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
Amin Arria
bd230df0d3
Added rebirthLevel var to remove need of extra translation string
2015-10-28 14:33:45 -04:30
Sabe Jones
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
Blade Barringer
cdc58c78fd
Merge branch 'nicolevonvon-develop' into develop
2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90
Add popover to no owner label
2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93
Challenges now display'no owner' if original owner deletes account
2015-10-27 22:15:19 +02:00
Alys
1cc7ea872f
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
2015-10-27 19:18:05 +10:00
Alys
23059763eb
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
2015-10-27 18:45:30 +10:00
Sabe Jones
f5d6c92897
chore(news): Exhaust Strike Bailey
2015-10-27 00:24:11 -04:00
Blade Barringer
c04b27ffd5
Simplify community guidelines string
2015-10-26 18:08:45 -05:00
Blade Barringer
f0e4149adb
Merge branch 'develop' into ksami-develop
2015-10-26 17:56:05 -05:00
Blade Barringer
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
Sabe Jones
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
ksami
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
ksami
b3cc58886c
Make strings translatable in options/social/chat-box
2015-10-23 23:20:59 +08:00
Sabe Jones
78416f68da
fix(sharing): Better social button positioning
2015-10-22 16:00:55 -04:00
Sabe Jones
152fb72899
fix(sharing): Needed return object
2015-10-22 15:08:04 -04:00
Sabe Jones
e2cfd1bd54
feat(sharing): Load widgets from service
2015-10-22 14:37:29 -04:00
Sabe Jones
281411f423
Merge branch 'develop' into sabrecat/more-modals
2015-10-22 14:05:26 -04:00
Sabe Jones
bcc522f08d
feat(sharing): Add Tumblr button
2015-10-22 13:52:26 -04:00
Sabe Jones
d08a3efbcd
fix(news): Bogus trailing slash
2015-10-22 12:04:43 -05:00
Anil Anar
e269e04172
fix a minor syntax error when opening reroll modal.
2015-10-22 09:24:04 +02:00
Sabe Jones
9fb671f068
fix(social): Better share image
2015-10-21 16:25:03 -05:00
Sabe Jones
a2c0e02283
fix(social): Correct OG tag errors
2015-10-21 16:37:33 -04:00
Sabe Jones
d32f6f23cc
feat(sharing): Improved front page FB share
2015-10-21 15:59:17 -04:00
Sabe Jones
44818882f6
feat(sharing): Pretty Tweet button for level up
2015-10-21 15:23:31 -04:00
Sabe Jones
5fbd6814b0
fix(pets): Realign frog sprites
...
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Sabe Jones
1ad6ffd35d
Merge branch 'develop' into sabrecat/more-modals
2015-10-20 12:50:34 -04:00
Sabe Jones
d0a34fc0ad
feat(quests): 2015-10 Pet
...
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Saravanan Ganesh
df7fd2e036
fix(chat): #5864 API should return flagged messages in chat only to mods
2015-10-19 21:43:24 -07:00
Sabe Jones
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
Amin Arria
3bd809f7c2
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
2015-10-19 12:14:38 -04:30
Amin Arria
038039dbee
Fixes #5550 , change message according to rebirthLevel
2015-10-19 12:10:27 -04:30
