sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11580 commits 3 branches 0 tags 1.6 GiB
Commit graph

1013 commits

Author SHA1 Message Date
Gautham Chandra
37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Gautham Chandra
41e6abfc83 Fixed capitalization 2015-11-15 16:58:19 -05:00
Gautham Chandra
8df005d29e Added noscript content for the landing page 2015-11-15 16:42:48 -05:00
Gautham Chandra
b5e10bf1e9 Added a helpful message for when JS is disabled 2015-11-15 14:12:12 -05:00
Blade Barringer
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
Sabe Jones
f0a484bbe1 fix(strings): Variable population count 2015-11-11 21:10:24 -05:00
Sabe Jones
52f9f03afb fix(news): Link to Teespring storefront 2015-11-11 20:19:48 -05:00
Sabe Jones
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
Sabe Jones
b32ab5a587 chore(news): Pet quest Bailey 
Also adds one missing sprite asset for the quest.
 2015-11-11 18:31:22 -05:00
Sabe Jones
cc92b985a2 fix(sharing): Translatable share strings 2015-11-11 13:35:14 -05:00
Sabe Jones
cc2a6d4db1 fix(sharing): Push ng-binding into Jade 2015-11-11 13:09:00 -05: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
a393cdc94b fix(sharing): Correct Jade interpolation 2015-11-10 16:33:33 -05:00
Sabe Jones
ada7ca71ad fix(sharing): Use env BASE_URL 2015-11-10 16:27:40 -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
Gautham Chandra
b9b2536478 User can now check out of inn from tasks page 
Fixes #5651
 2015-11-07 18:32:19 -05:00
Sabe Jones
164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
Sabe Jones
56fbc33d1c Merge branch 'develop' into Move-Overview-To-Website 
Conflicts:
	website/src/routes/pages.js
 2015-11-05 14:31:00 -05:00
Sabe Jones
18c2279be4 fix(overview): Wording and layout tweaks 2015-11-05 14:18:51 -05:00
Sabe Jones
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
Sabe Jones
3a1862ecef fix(static): Non-widgety App Store links 2015-11-04 22:42:10 -05:00
Sabe Jones
df7e0236c2 fix(static): Improved /apps layout 2015-11-04 15:30:42 -05:00
Sabe Jones
8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Blade Barringer
799190a898 Merge branch 'develop' into flag_messages_in_api 2015-11-04 07:56:34 -06:00
Amin Arria
6d93356967 Changed overview link 2015-11-03 22:56:47 -04:30
Amin Arria
5278a08c93 Added horizontal line 2015-11-03 22:32:23 -04:30
Amin Arria
7342735b1b Fix error missing web in webStep 2015-11-03 22:18:41 -04:30
Amin Arria
f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Sabe Jones
caa4170f12 fix(sharing): Wording tweaks 2015-11-03 17:19:57 -05:00
Sabe Jones
02abee9f4e fix(sharing): Landing page tweaks 2015-11-03 16:16:17 -05:00
Sabe Jones
0260ea3fcd WIP(sharing): Draft functional landing page 2015-11-03 15:04:31 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Amin Arria
167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Blade Barringer
24480e5f04 Merge branch 'develop' into srrvnn-develop 2015-11-03 07:31:48 -06:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Blade Barringer
0894a3ea2d Merge branch 'develop' into srrvnn-develop 2015-11-02 06:45:45 -06:00
Sabe Jones
2e7006a0f7 chore(news): Burnout win Bailey 2015-10-31 16:03:34 -04:00
Blade Barringer
c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages 
Wrong max level messages
 2015-10-30 23:21:29 -05:00
Blade Barringer
2eb6cab2be Merge pull request #6014 from ahstro/toggle-chevrons 
Toggle chevron direction
 2015-10-30 23:13:51 -05:00
Blade Barringer
add761e58e Remove extraneous div 2015-10-30 23:05:19 -05:00
Blade Barringer
92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot
76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Thrashmandicoot
1051ff0006 Fix inline-styling to be class styling 2015-10-30 20:01:22 -07:00
Blade Barringer
d37450622c Create a social layout 2015-10-30 18:41:46 -05:00
Sabe Jones
0c5e520e6f WIP(sharing): Incomplete landing page 
First stab at creating landing pages for inbound social traffic. May need a different solution.
 2015-10-30 17:35:30 -04:00
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Sabe Jones
68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween 
WIP: Habitoween
 2015-10-30 14:46:44 -05:00