krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,907 Commits 63 Branches 1,225 Tags
d20354dd47bbb2dc72408653556a6d8dfc4b8fe9
Commit Graph

20 Commits

Author SHA1 Message Date
Blade Barringer
d20354dd47 Es2015ify the js content 2015-09-17 08:03:33 -05:00
Blade Barringer
eaaac546b9 Move translator file into helpers folder 2015-09-17 07:47:23 -05:00
Blade Barringer
a1d7ad70af Move spells to won file 2015-09-17 07:41:19 -05:00
Blade Barringer
eecc4e4a22 Rename mystery sets module 2015-09-16 20:29:26 -05:00
Blade Barringer
50d7adcae8 Extract mystery items into module 2015-09-16 20:28:46 -05:00
Blade Barringer
ccdcd32174 Extract time traveler stable into separate module 2015-09-16 20:22:42 -05:00
Blade Barringer
504a2e7a52 Move events to own module 2015-09-16 20:12:09 -05: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
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
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
Blade Barringer
e32de87991 Adjust numbering of faq.js 2015-09-06 19:44:37 -05:00
Blade Barringer
6fd2b9e537 Update content with web faq 2015-09-06 17:13:04 -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
8a06514c72 Move translation function to separate module 2015-09-06 15:54:38 -05:00
Blade Barringer
b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00