Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,896 Commits 64 Branches 1,256 Tags
2bde07fa1c34db5ec9fe7ef0a824db7b2d85f963
Commit Graph

861 Commits

Author SHA1 Message Date
Sabe Jones 3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Sabe Jones c8cc01fc44 feat(hourglass): Buy pets/mounts 
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
 2015-09-16 14:35:43 -04:00
Sabe Jones ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones 2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones 66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Blade Barringer 38e07246da chore(i18n): update locales 2015-09-13 18:38:59 -05:00
Blade Barringer 737b4703e6 Fix markdown bug in faq. Fixes #5920 2015-09-13 18:36:36 -05:00
Blade Barringer d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Alys 909ab4eb35 remove extra line breaks from "What are some sample tasks?" FAQ question - fixes https://github.com/HabitRPG/habitrpg/issues/5920 2015-09-14 07:07:12 +10:00
Blade Barringer 7aad958062 Merge pull request #5922 from crookedneighbor/gulpify 
Gulpify the sprites tasks
 2015-09-13 02:15:05 -05:00
Blade Barringer 41458fbd5b chore(i18n): update locales 2015-09-12 22:26:30 -05:00
Blade Barringer b65c8e3b16 Change directory name from guides to scenes 2015-09-12 21:23:41 -05:00
Blade Barringer 1df4cf81dd compile sprites using gulp 2015-09-12 11:22:15 -05:00
Blade Barringer 2c2ab97666 Move larger sprites to separate folder 2015-09-12 11:09:08 -05:00
Blade Barringer 384ee42bca Remove unused sprites 2015-09-12 08:35:18 -05:00
Alys fbfd2ef0ea add a missing closing bracket to the end of webFaqAnswer6 2015-09-12 23:22:47 +10:00
Alys fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
melarish 05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-08 13:25:10 -05:00
Mel Marley 2bddd79ffd Some things I tried 2015-09-08 13:59:34 +01:00
Sabe Jones 9421c63ac9 fix(FAQ): Remove sample task anchors 2015-09-07 21:58:56 -04:00
Blade Barringer 325fa976f6 chore(i18n): update locales 2015-09-07 15:27:52 -05:00
Blade Barringer c9af8e60b8 Adjust formatting 2015-09-06 20:29:09 -05:00
Blade Barringer e32de87991 Adjust numbering of faq.js 2015-09-06 19:44:37 -05:00
Blade Barringer ebc069747b Zero index faq strings 2015-09-06 19:43:52 -05:00
Blade Barringer 6fd2b9e537 Update content with web faq 2015-09-06 17:13:04 -05:00
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer 2fcc7df218 Change name of locales keys 2015-09-06 16:36:21 -05:00
Blade Barringer 1bce23c12b Transform magic number to constant 2015-09-06 16:22:06 -05:00
Blade Barringer 898ea845b3 Convert translation function to js 2015-09-06 16:20:14 -05:00
Blade Barringer 245c7d48c8 Simplify faq logic 2015-09-06 16:11:53 -05:00
Blade Barringer 4081a9a62a Add faq to content 2015-09-06 16:08:53 -05:00
Blade Barringer 6bad9623d8 Remove link 2015-09-06 16:08:22 -05:00
Blade Barringer 8a06514c72 Move translation function to separate module 2015-09-06 15:54:38 -05:00
Blade Barringer 5045ce3b2f Add FAQ 2015-09-06 15:31:20 -05:00
Blade Barringer b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Blade Barringer 82030a50fb Add faq to other languages 2015-09-06 13:54:40 -05:00
Blade Barringer 7bfa18fd05 chore(i18n): update locales 2015-09-06 13:33:29 -05:00
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05:00
Blade Barringer ee50fec2c1 Tweak wording of custom day start warning 2015-09-06 10:11:28 -05:00
Blade Barringer 0508f77ed4 Change wording of cds modal message 2015-09-06 09:45:12 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer 9bcaea6fa2 Merge branch 'develop' into carolstone-chron-run-early-issue-4488 2015-09-05 09:32:24 -05:00
Blade Barringer 6fc8e0b5a5 Merge branch 'develop' into sabrecat/party-page 2015-09-05 09:20:06 -05:00
Alys e0b57fa2c5 remove Show Classes Tour button from Settings page, and associated code 2015-09-05 17:29:27 +10:00
Blade Barringer 807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Sabe Jones 869651f5a2 feat(FAQ): Static FAQ page 
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
 2015-09-04 15:05:15 -04:00
Sabe Jones b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones 1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00