c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
5315cc9055
Update character.json to separate optOut into two translation strings
...
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.
Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
2db1ef0f7a
style(subscriptions): Gem layout feedback
2016-01-12 15:00:07 -05:00
8bc78af5ae
Added specificity to CSS, removed exxtra line
2016-01-12 15:00:07 -05:00
6a72027d8b
Add subscription conditionals for buying or purchasing gems
2016-01-12 14:58:39 -05:00
5f88aef3ca
Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status.
2016-01-12 14:58:39 -05:00
ea54ec607a
Add confirmation popover for Release pets/mounts
...
Add tests for releasing pets and mounts
Refactor tests to use expect syntax from sinon-chai
tests(karma): Refine settings controller tests
refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
f6f82cafc4
Add confirmation popover for Rebirth
...
Add confirmation popover for Fortify/Reroll
Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
363ef5e091
fix: Remove stray {{ characters
2015-12-26 19:05:12 -06:00
ef25956ba3
feat(views): Create generic message alert modal
2015-12-26 19:00:44 -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
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
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
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
c419ca8839
Merge pull request #6068 from AminArria/Wrong-max-level-messages
...
Wrong max level messages
2015-10-30 23:21:29 -05:00
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -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
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
78416f68da
fix(sharing): Better social button positioning
2015-10-22 16:00:55 -04:00
152fb72899
fix(sharing): Needed return object
2015-10-22 15:08:04 -04:00
e2cfd1bd54
feat(sharing): Load widgets from service
2015-10-22 14:37:29 -04:00
e269e04172
fix a minor syntax error when opening reroll modal.
2015-10-22 09:24:04 +02:00
44818882f6
feat(sharing): Pretty Tweet button for level up
2015-10-21 15:23:31 -04:00
1ad6ffd35d
Merge branch 'develop' into sabrecat/more-modals
2015-10-20 12:50:34 -04:00
3bd809f7c2
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
2015-10-19 12:14:38 -04:30
038039dbee
Fixes #5550 , change message according to rebirthLevel
2015-10-19 12:10:27 -04:30
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
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
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
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
6505824cb6
feat(modals): Levelup modal
...
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
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
f00bbd9652
feat(modals): Small style scroll award
2015-10-09 15:39:36 -04:00
b775b8f399
feat(modals): Simplified scroll drop
...
Conflicts:
website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
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
b32e521c56
Pull in client side changes for quest routes
2015-09-15 09:35:17 -05:00
4177202cee
Merge pull request #5855 from HabitRPG/sabrecat/party-page
...
Party Page Revamp
2015-09-06 13:28:14 -05:00
074e683ba7
Change formatting of cds modal
2015-09-06 09:57:44 -05:00
a44cd748af
Use the user's preferred date format
2015-09-06 09:42:48 -05:00
Sabe Jones