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

683 Commits

Author SHA1 Message Date
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Amin Arria 671d4aaecc Change timezone text 2015-11-23 11:38:26 -04:30
Blade Barringer 94bf181301 Add noscript locales 2015-11-17 22:02:57 -06:00
Blade Barringer 4d415ee9c1 chore(i18n): update locales 2015-11-17 21:54:30 -06:00
Blade Barringer fba35ea491 chore(i18n): update locales 2015-11-17 21:48:55 -06:00
Blade Barringer 6bd0ed76cc Fixes #6524. Correct spelling of community 2015-11-17 21:41:06 -06:00
Blade Barringer 71473a93ad chore(i18n): update locales 2015-11-17 21:38:32 -06:00
Blade Barringer 1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Gautham Chandra 37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Sabe Jones 2d1ad12cbd fix(strings): Make plural more greppable 2015-11-16 17:08:38 -05:00
Sabe Jones 16878af76f fix(string): Contest to Contestant 2015-11-16 16:17:48 -05:00
Sabe Jones e73c7be47a fix(achievement): Make Costume Contest repeatable 2015-11-16 16:07:16 -05:00
Amin Arria 807726305f Added timezone form 2015-11-12 19:27:25 -04:30
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 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 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
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
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 e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05: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 898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -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
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
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
Thrashmandicoot 64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot ebbc72e9c2 Refactor sellForGold, add displayPotion/item 2015-10-30 02:26:41 -07:00
Alys 1923a3a467 change on-hover text for Mystery Item gift box to just mention wiki page 2015-10-30 06:59:54 +10:00
Alys 11ae4a9b87 change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki 2015-10-30 06:30:11 +10:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00