Commit Graph

154 Commits

Author SHA1 Message Date
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
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
164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05: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
Sabe Jones
c28afc9abc feat(sharing): Buttons for more modals 2015-10-29 16:33:27 -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
Sabe Jones
27e3797307 Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/locales/en/challenge.json
2015-10-28 14:54:55 -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
Anil Anar
e269e04172 fix a minor syntax error when opening reroll modal. 2015-10-22 09:24:04 +02:00
Sabe Jones
44818882f6 feat(sharing): Pretty Tweet button for level up 2015-10-21 15:23:31 -04:00
Sabe Jones
1ad6ffd35d Merge branch 'develop' into sabrecat/more-modals 2015-10-20 12:50:34 -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
6505824cb6 feat(modals): Levelup modal
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
Sabe Jones
5eacba54b8 feat(modals): Slim scroll notif
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
2015-10-13 14:20:51 -04:00
Sabe Jones
f00bbd9652 feat(modals): Small style scroll award 2015-10-09 15:39:36 -04:00
Sabe Jones
b775b8f399 feat(modals): Simplified scroll drop
Conflicts:
	website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
Sabe Jones
f6abcc0ddf WIP(world-boss): Initial stats outlay
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
Blade Barringer
b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Blade Barringer
4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
2015-09-06 13:28:14 -05:00
Blade Barringer
074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer
a44cd748af Use the user's preferred date format 2015-09-06 09:42:48 -05:00
Blade Barringer
3a8eda6c1a Remove extraneous info about last cron 2015-09-05 15:35:07 -05:00
Blade Barringer
9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer
807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Sabe Jones
b5124e6cd8 fix(warnings): Show modal only once
Also removes a random extra newline.
2015-09-03 11:12:54 -04:00
Sabe Jones
1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones
e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
Sabe Jones
6f85fcfde2 Merge branch 'develop' into sabrecat/party-page
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
2015-09-01 13:40:20 -05:00
Blade Barringer
41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer
f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer
3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer
ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer
a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer
4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00