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
f0a484bbe1
fix(strings): Variable population count
2015-11-11 21:10:24 -05:00
52f9f03afb
fix(news): Link to Teespring storefront
2015-11-11 20:19:48 -05:00
6acd6460ea
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
...
Increase code coverage for clearflags route
2015-11-11 18:49:37 -06:00
43064dcf9a
Wrap flag purcging code in check for flags object
2015-11-11 18:00:15 -06:00
13da95b552
Add tests for clearflags route
2015-11-11 17:58:41 -06:00
83b61f9aa3
Merge branch 'develop' into sabrecat/pet-201511
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-11-11 18:36:25 -05:00
06a5a1cb95
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
...
More and better modals; Social Media sharing
2015-11-11 17:32:43 -06:00
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
cc92b985a2
fix(sharing): Translatable share strings
2015-11-11 13:35:14 -05:00
cc2a6d4db1
fix(sharing): Push ng-binding into Jade
2015-11-11 13:09:00 -05:00
117a254cc8
Patch exploit that would allow users to auto-delete messages
2015-11-11 06:46:11 -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
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06: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
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
9cf3c72002
Merge pull request #6188 from crookedneighbor/fix_user
...
Correct code to not iterate over mongoose object
2015-11-05 20:20:25 +01:00
18c2279be4
fix(overview): Wording and layout tweaks
2015-11-05 14:18:51 -05:00
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
bb55a74f48
chore(news): iOS update Bailey
...
Also fixes the color of the iOS app icon and codes it more intelligently.
2015-11-05 11:48:51 -05:00
78cfbd2c6a
Revert btn-buy style change
2015-11-04 22:02:50 -06:00
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
df7e0236c2
fix(static): Improved /apps layout
2015-11-04 15:30:42 -05:00
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01:00
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
5278a08c93
Added horizontal line
2015-11-03 22:32:23 -04:30
7342735b1b
Fix error missing web in webStep
2015-11-03 22:18:41 -04:30
f79110d6d2
Changed to be more like the FAQ
2015-11-03 22:03:24 -04:30
caa4170f12
fix(sharing): Wording tweaks
2015-11-03 17:19:57 -05:00
02abee9f4e
fix(sharing): Landing page tweaks
2015-11-03 16:16:17 -05:00
0260ea3fcd
WIP(sharing): Draft functional landing page
2015-11-03 15:04:31 -05:00
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
167af1afd4
New static page: overview
2015-11-03 13:35:14 -04:30
fa9b331f03
Created route for overview
2015-11-03 13:15:55 -04:30
Blade Barringer