sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 00:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8169 commits 3 branches 0 tags 1.6 GiB
Commit graph

8169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Blade Barringer
576eec77f7 Removed extraneous img folder 2015-02-03 14:08:17 -06:00
Blade Barringer
9f420d0e7a Made symlink to audio folder 2015-02-03 14:06:04 -06:00
Blade Barringer
380dab7ae9 Moved audio out of common public folder 2015-02-03 14:04:53 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00
Blade Barringer
e55b8dd5bc Wrote first version of sprite gulp task 2015-02-02 19:00:51 -06:00
Blade Barringer
5a61f30138 Removed test sprite files 2015-02-02 18:27:39 -06:00
Blade Barringer
f5f1964249 Started organizing common folder 2015-02-01 23:09:07 -06:00
Blade Barringer
e7b68c87ad Wrote copy task, started sprite config 2015-02-01 17:38:13 -06:00
Blade Barringer
87d91b07be Added clean task 2015-02-01 17:25:08 -06:00
Blade Barringer
70fdc73d8f Started working on gulp file. First version of karma and stylus complete 2015-02-01 17:10:53 -06:00
Blade Barringer
ce2e88c6af Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-01 14:08:19 -06:00
Blade Barringer
88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
 2015-02-01 14:07:18 -06:00
Blade Barringer
2313211d30 Merge branch 'develop' into common-convert 2015-02-01 11:55:17 -06:00
Blade Barringer
cbc4e1efea Adjusted subscription page to use correct formatting with one time 
bindings
 2015-02-01 09:27:10 -06:00
Matt T Elliott
1da26acc93 fix jade vs angular 2015-02-01 09:27:10 -06:00
Matt T Elliott
f6aefa5cf4 fix spacing 2015-02-01 09:27:09 -06:00
Matt T Elliott
cec5797fc9 fix presskit and header 2015-02-01 09:27:09 -06:00
Matt T Elliott
978ba0186e fix bg popover translations 2015-02-01 09:25:44 -06:00
Matt T Elliott
71436288ff fix quest rewards translation 2015-02-01 09:25:44 -06:00
Matt T Elliott
0d08f3edb0 fix translations on presskt page 2015-02-01 09:25:43 -06:00
Matt T Elliott
aefcd116ab fix translations on coupon page 2015-02-01 09:25:43 -06:00
Matt T Elliott
4ed80824bf fix translations on task progress chart 2015-02-01 09:25:43 -06:00
Matt T Elliott
026b4ed716 add translations to subscription page 2015-02-01 09:25:43 -06:00
Matt T Elliott
c31272a154 add subscriptitonRateText 2015-02-01 09:25:43 -06:00
Blade Barringer
692f968ea4 Added score string 2015-02-01 09:25:04 -06:00
Matt T Elliott
b6d4b7ea79 add translation strings 2015-02-01 09:25:04 -06:00
Matteo Pagliazzi
09015370f0 feat(i18n): add strings 2015-02-01 15:21:38 +01:00
Matteo Pagliazzi
ff9280deea feat(i18n): add string 2015-02-01 15:09:50 +01:00
Matteo Pagliazzi
bb855bf993 feat(i18n): add string 2015-02-01 15:00:44 +01:00
Matteo Pagliazzi
eb1ca43c44 fix(db): upgrade flags.recaptureEmailsPhase to new values 2015-02-01 12:56:07 +01:00
Matteo Pagliazzi
0bf7bdad0a add some settings strings 2015-01-31 17:46:02 +01:00
Matteo Pagliazzi
7464a6c692 chore(i18n): update locales 2015-01-31 16:08:55 +01:00
Sabe Jones
c1f3c8f5a0 chore(grunt): grunt 2015-01-31 08:59:19 -06:00
Sabe Jones
7e0d810463 fix(event): Robes not for your head 2015-01-31 08:58:23 -06:00
Sabe Jones
b4eb2256c6 chore(grunt): grunt 2015-01-31 08:49:50 -06:00
Sabe Jones
51b2b9bda1 fix(event): Party robes 
The 2015 party robes were erroneously set up as event-duration gear, when they should have been added instead as conditional gear added only via database migration. Fixes https://github.com/HabitRPG/habitrpg/issues/4601.
 2015-01-31 08:48:00 -06:00
Blade Barringer
0e9be3217c Fixed comment 2015-01-30 23:20:38 -06:00
Alice Harris
7ab4cf5653 add comment about end dates for special events 2015-01-31 12:46:27 +10:00
Alice Harris
5aecf8fd55 change end date for winter gear 2015-01-31 11:48:31 +10:00
Tyler Renelle
8670e269ed upgrade mongoose => 3.8.20, upgrade npm 2015-01-30 17:26:35 -07:00
Alice Harris
e8eec7386e fix comment in script 2015-01-31 09:19:46 +10:00
Alice Harris
5e671568ac remove new birthday robes from people who don't have original birthday achievement 2015-01-31 09:17:23 +10:00
Sabe Jones
5336d5b0d3 chore(grunt): grunt full 2015-01-30 13:57:14 -06:00
Sabe Jones
18afb1ce18 Merge pull request #4592 from SabreCat/birthday 
Habit Birthday 2015
 2015-01-30 13:55:00 -06:00
Sabe Jones
b131d5b531 Merge pull request #458 from SabreCat/birthday 
Habit Birthday 2015
 2015-01-30 13:53:53 -06:00
Sabe Jones
47d14a1f99 fix(news): Prettify Bailey more 2015-01-30 13:51:48 -06:00
Sabe Jones
4fe4c01f3c fix(news): Left right left 2015-01-30 13:48:44 -06:00
Sabe Jones
0007e870ed chore(news): Bailey 2015-01-30 13:44:09 -06:00
negue
3e41b62bc9 Include mixins.jade also in layout.jade 2015-01-30 17:47:55 +01:00