Commit graph

554 commits

Author SHA1 Message Date
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
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
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
8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Amin Arria
6d93356967 Changed overview link 2015-11-03 22:56:47 -04:30
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05: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
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Sabe Jones
dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -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
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
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
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
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
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
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
Sabe Jones
22ec450521 feat(modals): Won Challenge
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
Sabe Jones
338aced208 feat(modals): Grew Mount
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10 feat(modals): Hatch Pet modal
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Sabe Jones
6505824cb6 feat(modals): Levelup modal
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00