Alys
cb1f745d39
Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
...
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
2015-11-19 07:09:14 +10:00
Blade Barringer
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
Blade Barringer
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06:00
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
Oliver Eyton-Williams
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
Oliver Eyton-Williams
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
Blade Barringer
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06: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
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
Blade Barringer
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
Phillip Thelen
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01: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
Matteo Pagliazzi
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01: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
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
1ad6ffd35d
Merge branch 'develop' into sabrecat/more-modals
2015-10-20 12:50:34 -04:00
Blade Barringer
9ad1dbd8ce
Adjust mystic hourglass string to take in interpolation
2015-10-19 08:10:37 -05:00
Blade Barringer
d9de32f2dc
Add todo to investigate magic numbers
2015-10-19 08:04:47 -05:00
Blade Barringer
1a2510e4da
Adjsut string to take in interpolation
2015-10-19 08:03:27 -05:00
Blade Barringer
931d688637
Use Content service
2015-10-19 08:03:14 -05:00
Blade Barringer
f03be07595
Add extra line breaks
2015-10-19 08:02:35 -05:00
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
5bfea172ee
fix(notifications): Don't double-modal
...
Corrects behavior of the Notifications controller so that it skips showing the generic levelup modal if it's going to display the quest scroll version.
2015-10-13 17:01:07 -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
f00bbd9652
feat(modals): Small style scroll award
2015-10-09 15:39:36 -04:00
Blade Barringer
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05:00
Sabe Jones
6a6b67b9c1
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
...
Front page Tweet button
2015-09-22 17:38:47 -05:00
Blade Barringer
8881dbc034
Remove uneeded blank spaces
2015-09-16 20:01:42 -05:00
Sabe Jones
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7
fix(hourglass): Use method on $scope
2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6
feat(hourglass): Individual filter functions
2015-09-16 16:35:04 -04:00
Blade Barringer
78fe1073d4
Add user sync to sendAction
2015-09-15 16:39:08 -05:00
Blade Barringer
0fe6054b76
Add missing client code
2015-09-15 10:53:56 -05:00
Blade Barringer
b32e521c56
Pull in client side changes for quest routes
2015-09-15 09:35:17 -05:00
Blade Barringer
5553d74334
Create method to calculate whether or not user has attained all mystery equipment
2015-09-13 16:26:29 -05:00
Blade Barringer
b6f02d388f
Correct method to correctly add an hourglass in debug menu
2015-09-13 16:25:57 -05:00
Blade Barringer
cd4ec5bd12
Adjust formatting in footer controller
2015-09-13 02:19:34 -05:00
