6e8e1648d9
Merge branch 'develop' into api-v3
2015-11-13 07:38:24 -06:00
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06:00
c5445dc426
Merge branch 'develop' into api-v3
2015-11-11 19:42:39 -06:00
3795b1d151
wip: starts upgrading lodash to v3
2015-11-11 10:32:49 +01: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
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
8881dbc034
Remove uneeded blank spaces
2015-09-16 20:01:42 -05:00
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
fb50f27fa7
fix(hourglass): Use method on $scope
2015-09-16 16:46:12 -04:00
98cd8364c6
feat(hourglass): Individual filter functions
2015-09-16 16:35:04 -04:00
0fe6054b76
Add missing client code
2015-09-15 10:53:56 -05:00
5553d74334
Create method to calculate whether or not user has attained all mystery equipment
2015-09-13 16:26:29 -05:00
b6f02d388f
Correct method to correctly add an hourglass in debug menu
2015-09-13 16:25:57 -05:00
cd4ec5bd12
Adjust formatting in footer controller
2015-09-13 02:19:34 -05:00
14fabfbe40
Remove excess white space
2015-09-12 22:34:58 -05:00
9d5f9328da
WIP(social): Twitter widget script
2015-09-10 17:44:52 -04:00
05cf144630
Pulled and merged
2015-09-09 23:23:45 +01:00
f8ce7c2292
fix(analytics): Track modals correctly
...
Fixes #5879 .
2015-09-07 22:23:42 -04:00
d6f416b6d3
feat(analytics): Track party buttons
2015-09-07 12:02:01 -04:00
4177202cee
Merge pull request #5855 from HabitRPG/sabrecat/party-page
...
Party Page Revamp
2015-09-06 13:28:14 -05:00
f1224bc6be
Use select instead of an input for cds
2015-09-06 09:36:29 -05:00
Blade Barringer