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

8236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer f2fc115034 Set default gulp to be dependant on NODE_ENV 2015-02-03 22:19:02 -06:00
Blade Barringer 27dbb30ce8 Added browserify to prod task 2015-02-03 22:13:48 -06:00
Blade Barringer 0329f156e9 added watch tasks 2015-02-03 22:07:35 -06:00
Blade Barringer cac788e7db djusted paths 2015-02-03 21:43:10 -06:00
Blade Barringer 9b8f006064 Added sinon and corrected path 2015-02-03 21:30:43 -06:00
Blade Barringer 0f62845fb2 Moved tests into main test folder and corrected path to common files 2015-02-03 21:29:05 -06:00
Blade Barringer 9342e8095a REmoved unused favicon 2015-02-03 21:26:12 -06:00
Blade Barringer 632019c798 REmoved unused compiled file 2015-02-03 21:25:28 -06:00
Blade Barringer 01ab05ea35 Removed license 2015-02-03 21:25:20 -06:00
Blade Barringer 32dc8e112e Removed unused grunt file from common 2015-02-03 21:22:22 -06:00
Blade Barringer f54b28e7bf Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 21:17:52 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
 2015-02-03 21:13:55 -06:00
Tyler Renelle 035fe8c0de Merge pull request #4625 from HabitRPG/lefnire/facebook-to-local 
feat(facebook-to-local): allow users to move from facebook=>local
 2015-02-03 19:27:20 -07:00
Tyler Renelle af72ffbca6 Merge pull request #464 from HabitRPG/lefnire/facebook-to-local 
feat(facebook-to-local): allow users to move from facebook=>local
 2015-02-03 19:26:32 -07:00
Tyler Renelle 5ec2c118a5 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:23:49 -07:00
Tyler Renelle a4c2bf61b2 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:13:32 -07:00
Blade Barringer a59067def7 Corrected build directory path and clean sprites directory before 
generating sprites
 2015-02-03 20:13:29 -06:00
Blade Barringer afe6177da6 Added in comment about why images need to be broken up 2015-02-03 20:03:27 -06:00
Blade Barringer 916de09914 Updated images in shared 2015-02-03 19:57:58 -06:00
Blade Barringer 93d87ce336 Added additional css for sprite minification 2015-02-03 19:54:54 -06:00
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 8aa74f07b4 Merge pull request #4623 from SabreCat/feb-backgrounds 
Feb backgrounds Bailey
 2015-02-03 19:13:41 -06:00
Sabe Jones a8fdeee069 chore(grunt): grunt 2015-02-03 19:13:00 -06:00
Sabe Jones 58af9622d6 chore(news): Feb backgrounds Bailey 2015-02-03 19:05:42 -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
Tyler Renelle b013c61b3b feat(change-email): remove blurb about changing email address 2015-02-03 15:46:51 -07: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 ca2c7a99ed Merge pull request #4621 from HabitRPG/lefnire/change-email 
feat(change-email): allow changing email address
 2015-02-03 15:40:06 -07: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
Tyler Renelle 8852ac6b69 feat(change-email): allow changing email address 2015-02-03 15:35:48 -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
Matteo Pagliazzi fd900a5edc disabling loggly here and via configuration 2015-02-03 21:11:02 +01: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