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
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
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01:00
5269df2932
namefix
2015-10-28 09:47:04 +02:00
078c37bdda
presskit
...
press kit update
2015-10-27 15:34:52 +02: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
04550a3346
Add btn-sell to increase width of market button to container
2015-10-07 19:18:54 -07:00
76fcbfc19f
Toggle chevron direction
...
When editing a task, there are some expandable options available with a
chevron next to them (e.g. 'Tags' and 'Advanced Options'). This commit
makes the chevrons' directions toggle based on whether the related
option is expanded or collapsed, up and down respectively.
2015-10-05 22:17:28 +02:00
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05:00
Blade Barringer