Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,561 Commits 64 Branches 1,256 Tags
5fb585b896e976d5eb3dae9bf67f38ebbb44f039
Commit Graph

1145 Commits

Author SHA1 Message Date
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
Blade Barringer 92a8c3d958 chore(i18n): update locales 2015-11-11 20:24:12 -06:00
Sabe Jones f0a484bbe1 fix(strings): Variable population count 2015-11-11 21:10:24 -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 eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones 586edc03c6 WIP(pets): Incomplete cobra sprites 2015-11-11 16:23:38 -05:00
Sabe Jones cc92b985a2 fix(sharing): Translatable share strings 2015-11-11 13:35:14 -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
Blade Barringer 3726f48ff2 chore(i18n): update locales 2015-11-04 21:57:16 -06:00
Sabe Jones 3a1862ecef fix(static): Non-widgety App Store links 2015-11-04 22:42:10 -05:00
Sabe Jones de5d2df94c fix(i18n): Add missing string 2015-11-04 16:04:51 -05:00
Sabe Jones 8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Amin Arria 8611c00201 Added links 2015-11-03 22:38:55 -04:30
Amin Arria f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
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
Sabe Jones 3691a59ddb fix(front-page): Update registered user count 2015-11-03 12:30:54 -06:00
Amin Arria 167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Sabe Jones 1fa15ba24a Merge pull request #6167 from HabitRPG/sabrecat/content-201511 
November backgrounds and Armoire
 2015-11-03 11:58:51 -06:00
Blade Barringer 2713b0f26f chore(i18n): update locales 2015-11-02 22:08:28 -06:00
Sabe Jones 6b3fcd3d11 fix(content): Correct stats for Royal Robes 
...in newtype content file
 2015-11-02 17:34:59 -05:00
Sabe Jones 510080325d fix(content): Correct missing Armoire items 
...in newstyle content files
 2015-11-02 17:33:03 -05: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
Sabe Jones 9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Alys fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09:00
Alys 8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09: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 4a9b0f1d12 Merge branch 'Thrashmandicoot-merchant-button-fix' into develop 2015-10-30 22:50:26 -05:00
Blade Barringer 898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Blade Barringer 391e09dd33 Fix auto-redirect 2015-10-30 22:28:11 -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
Alys 154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys 34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10: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
Blade Barringer ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Sabe Jones 68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween 
WIP: Habitoween
 2015-10-30 14:46:44 -05:00
Sabe Jones dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -04:00
Alys 161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer 724bc6e861 Compiled css for sprites 2015-10-30 10:10:12 -05:00
Blade Barringer e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00
Blade Barringer aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00