Lucas Torroba
4f4ea8416c
Closed issue #6758
...
After some discussion on the thread, this is probably the neatest
solution to issue #6758 . I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
Sabe Jones
274157d21d
Merge branch 'tylerxo/menu-error-fix' into develop
2016-01-20 14:34:55 -05:00
Tyler Smith
f3d6c62484
More closely matching coding style within the file
2016-01-19 19:57:11 -08:00
Tyler Smith
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
Jason Vinson
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
Sabe Jones
81842bbee1
fix(subscription): visual and wording tweaks
2016-01-12 15:29:10 -05:00
Blade Barringer
837c27ff4c
Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
...
Encode special characters when sending to paypal
2016-01-03 19:40:39 -06:00
Georgi Gardev
430bcd2652
Encode special characters when sending to paypal
2015-12-31 02:46:56 +02:00
Blade Barringer
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
Georgi Gardev
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
Georgi Gardev
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
Paul Rich
56a00efb19
Fix for Issue #3517 Display Current Page Name
...
Revision for Fix for issue #3517
lint: Remove extraneous white space in app.js file
fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Blade Barringer
7df3b333f6
feat: Refine clear local storage function
2015-12-26 19:00:45 -06:00
Sabe Jones
6ed9133f70
WIP(event): Winter Wonderland 2015-16 partial
2015-12-15 17:15:02 -05:00
Sabe Jones
e638661c71
Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
...
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
Sabe Jones
dd4ca5c476
refactor(modals): More readable invalid hatch check
2015-12-07 16:00:52 -05:00
Sabe Jones
0f578b79ff
feat(pets): Peppermint Hatching Potions
...
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Sabe Jones
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
Sabe Jones
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
Sabe Jones
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
Keith Holliday
4663c7cf5e
Added translation functions to task types
2015-11-30 09:26:07 -06:00
Keith Holliday
ea87784575
tasks-fix-delete-message
2015-11-29 14:30:22 -06:00
Keith Holliday
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
Sabe Jones
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
Sabe Jones
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
Sabe Jones
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
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Keith Holliday
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
Keith Holliday
9a8f9c6938
Fixed wording to be parallel with logic
2015-11-22 15:59:18 -06:00
Keith Holliday
b668829d85
Added ability to invert pushToBottom when holding down ctrl or cmd button
2015-11-22 15:57:14 -06:00
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
Amin Arria
21dcafd964
Fixed missing 0 when minutes where less than 10
2015-11-15 22:59:58 -04:30
Amin Arria
3f37da6f04
Created filter to convert timezone offset to UTC
2015-11-12 19:24:28 -04:30
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
