483ff8cb67
Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
...
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
3a20455cda
fix(modals): Rehatch pets
...
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
2015-11-30 16:11:13 -05:00
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
ad347090c3
Merge remote-tracking branch 'origin/pr/5968' into develop
...
Conflicts:
website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
3c672ea814
Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
...
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
28205663e4
fix(modals): Show mount modal more often
...
Fixes #6288 . Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
9a8f9c6938
Fixed wording to be parallel with logic
2015-11-22 15:59:18 -06:00
b668829d85
Added ability to invert pushToBottom when holding down ctrl or cmd button
2015-11-22 15:57:14 -06:00
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
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06: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
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06: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
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
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
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01: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
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
281411f423
Merge branch 'develop' into sabrecat/more-modals
2015-10-22 14:05:26 -04:00
bcc522f08d
feat(sharing): Add Tumblr button
2015-10-22 13:52:26 -04:00
d32f6f23cc
feat(sharing): Improved front page FB share
2015-10-21 15:59:17 -04: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
9ad1dbd8ce
Adjust mystic hourglass string to take in interpolation
2015-10-19 08:10:37 -05:00
d9de32f2dc
Add todo to investigate magic numbers
2015-10-19 08:04:47 -05:00
1a2510e4da
Adjsut string to take in interpolation
2015-10-19 08:03:27 -05:00
931d688637
Use Content service
2015-10-19 08:03:14 -05:00
f03be07595
Add extra line breaks
2015-10-19 08:02:35 -05:00
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
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
6505824cb6
feat(modals): Levelup modal
...
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
f00bbd9652
feat(modals): Small style scroll award
2015-10-09 15:39:36 -04:00
bfca612be2
Moved intial filtering to a scope function and added test
2015-09-24 16:39:53 -05:00
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05:00
6a6b67b9c1
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
...
Front page Tweet button
2015-09-22 17:38:47 -05:00
43c9683a8b
Added param to filter challenges by guild when a challenge is first clicked from guild
2015-09-21 19:35:14 -05:00
Sabe Jones