Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,195 Commits 64 Branches 1,256 Tags
08daed21ce62ce4a9f52a92990b3d52a951ca39d
Commit Graph

8195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 08daed21ce Removed register task from coffee script require 2015-02-03 19:40:23 -06:00
Blade Barringer 450fdb1486 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:29:54 -06:00
Blade Barringer 44a89dd0bd Corrected sprite task 2015-02-03 19:29:22 -06:00
Blade Barringer 47f05f452e Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:26:58 -06:00
Blade Barringer 6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-02-03 19:26:14 -06:00
Sabe Jones 7d63c9f8b2 Merge pull request #463 from SabreCat/feb-backgrounds 
February Backgrounds
 2015-02-03 19:14:11 -06:00
Sabe Jones a8fdeee069 chore(grunt): grunt 2015-02-03 19:13:00 -06:00
Sabe Jones ca70254751 feat(February): Backgrounds 2015-02-03 19:00:19 -06:00
Blade Barringer bf6fdf8d9d Updated paths 2015-02-03 18:55:17 -06:00
Blade Barringer 14e5f475ab Moved config back 2015-02-03 16:58:03 -06:00
Blade Barringer 393d614c7f Moved scirpts back in place 2015-02-03 16:56:50 -06:00
Blade Barringer 5ddb44a65b Corrected path to common module 2015-02-03 16:45:53 -06:00
Blade Barringer 277f7347ab Updated coffee script parser to parse the common scripts 2015-02-03 16:45:43 -06:00
Tyler Renelle ed0f406e2f Merge pull request #462 from HabitRPG/lefnire/change-email 
feat(change-email): allow changing email address
 2015-02-03 15:40:04 -07:00
Tyler Renelle 2331840386 feat(change-email): allow changing email address 2015-02-03 15:39:02 -07:00
Blade Barringer fc6a4a70b9 Updated gulpfile 2015-02-03 16:19:37 -06:00
Blade Barringer 3e5663bebf Removed files 2015-02-03 16:17:03 -06:00
Blade Barringer 53b81ec0e8 corrected public directory path 2015-02-03 14:41:22 -06:00
Blade Barringer 220942fb9d Corrected path to common files 2015-02-03 14:17:21 -06:00
Blade Barringer 052d031752 Corrected missing slash 2015-02-03 14:11:39 -06:00
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
Matteo Pagliazzi 3cde2aa485 chore(i18n): update locales 2015-02-03 19:54:38 +01:00
Sabe Jones 43c9a020b6 Merge pull request #461 from SabreCat/end-event 
End Winter event
 2015-02-02 19:12:49 -06:00
Sabe Jones c5691c6536 chore(grunt): grunt full 2015-02-02 19:09:00 -06:00
Blade Barringer e55b8dd5bc Wrote first version of sprite gulp task 2015-02-02 19:00:51 -06:00
Sabe Jones c9b81414a4 feat(seasonal): Normal view 2015-02-02 18:53:54 -06:00
Blade Barringer 5a61f30138 Removed test sprite files 2015-02-02 18:27:39 -06:00
Matteo Pagliazzi d97432f18c chore(i18n): update locales 2015-02-02 16:05:04 +01: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
Matteo Pagliazzi 0649599cfc add string 2015-02-01 22:24:08 +01: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