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
78890012c1
Merge pull request #6305 from markhowson/fix_narrow_guild_desc
...
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06: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
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00:00
274f4ab4d2
Removed css in favor of using inverted glyphicon
2015-11-25 23:44:13 -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
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10: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
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06: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
21dcafd964
Fixed missing 0 when minutes where less than 10
2015-11-15 22:59:58 -04:30
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
3f37da6f04
Created filter to convert timezone offset to UTC
2015-11-12 19:24:28 -04:30
5fb585b896
Merge pull request #6226 from HabitRPG/fix_tutorial_flag
...
Move header assignment to app level
2015-11-12 12:37:31 -06:00
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06:00
efd0e2333e
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
...
User can now check out of inn from tasks page
2015-11-11 20:49:35 -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
b9b2536478
User can now check out of inn from tasks page
...
Fixes #5651
2015-11-07 18:32:19 -05:00
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
78cfbd2c6a
Revert btn-buy style change
2015-11-04 22:02:50 -06: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
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
2eb6cab2be
Merge pull request #6014 from ahstro/toggle-chevrons
...
Toggle chevron direction
2015-10-30 23:13:51 -05:00
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
c2222a42c7
Add 70% width styling for item sales
2015-10-30 20:01:06 -07:00
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -04:00
68fabbf56f
Update names
2015-10-29 08:07:06 -05:00
4b44c935e8
Merge branch 'develop' into Bunjl-develop
2015-10-29 07:58:31 -05:00
bce37f7220
Adjusted Press Kit naming.
2015-10-29 07:55:17 -05: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
Sabe Jones