krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,920 Commits 64 Branches 1,226 Tags
b7cd46a6fe02b1ce1db910b8e5549ff39b2bc0a2
Commit Graph

882 Commits

Author SHA1 Message Date
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
Sabe Jones
e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
Sabe Jones
1d6bd8f392 fix(style): Decap guild/party/chat 2015-09-02 13:50:34 -04:00
melarish
b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01:00
Sabe Jones
7765f9ca04 test(mystery): Time Travelers test WIP 2015-09-01 17:37:39 -04:00
Sabe Jones
5274fd236a WIP(time-travel): Time Travel pets/mounts 
Also begins process of adding tests for Mystic Hourglass purchases.
 2015-09-01 17:17:50 -04:00
Sabe Jones
2c0d59989a feat(groups): Hide sync button when irrelevant 
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
 2015-09-01 15:14:38 -04:00
Sabe Jones
6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	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-01 13:40:20 -05:00
Sabe Jones
3ccf09ca27 feat(quests): Horse quest 2015-09-01 13:26:41 -04:00
Sabe Jones
daf3a2d2bc feat(pets): Horse sprites 2015-09-01 12:07:21 -05:00
Sabe Jones
5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Sabe Jones
c0a47130e4 chore(content): Compile sprites 2015-08-31 15:54:08 -05:00
Blade Barringer
6e7787dcf5 chore(i18n): update locales 2015-08-30 10:25:55 -05:00
Blade Barringer
0b4c03a678 chore(i18n): update locales 2015-08-29 17:41:19 -05:00
Blade Barringer
19c3e22176 chore(i18n): update locales 2015-08-29 11:46:01 -05:00
Blade Barringer
cbea9f4200 chore(i18n): update locales 2015-08-29 07:38:54 -05:00
Blade Barringer
a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
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-08-28 13:24:10 -05:00
Sabe Jones
f308116c54 feat(tutorial): Moar avatars 2015-08-28 11:48:30 -05:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones
f5c08c4ae5 WIP(tutorial): Gregarious Vice 2015-08-27 15:36:53 -05:00
Sabe Jones
f8994a3ee3 WIP(tutorial): Revised images 2015-08-27 15:21:09 -05:00
Sabe Jones
c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
Sabe Jones
5c4ebef0a9 feat(tutorial): New intro images 2015-08-27 13:08:12 -05:00
Alys
049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12 
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
 2015-08-26 22:01:29 +10:00
Alys
bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10:00
Sabe Jones
9ed1e2ba6d fix(mystery): Force coffee compile 2015-08-24 23:37:54 -05:00
Sabe Jones
d70aa46ec1 fix(mystery): Adjust date range 2015-08-24 21:33:02 -05:00
Sabe Jones
c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00