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

8266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 67f478bb0e Adjusted paths to files 2015-02-05 16:37:22 -06:00
Blade Barringer 4572900a59 Wrote first version of hashing task 2015-02-05 13:34:14 -06:00
Blade Barringer 05bbd8dd31 Added gulp-hash to package json 2015-02-05 11:58:19 -06:00
Blade Barringer 1fd7048ac0 Fixed semicolon -> comma 2015-02-05 11:58:08 -06:00
Blade Barringer 0fdd2faaa2 cleaned up processes a bit 2015-02-05 11:43:07 -06:00
Blade Barringer 851a79ede6 Separated out tasks from build 2015-02-05 11:39:11 -06:00
Blade Barringer cd4225bdb7 refactored paths for build 2015-02-05 11:32:57 -06:00
Blade Barringer 9adcc37dc4 Changed to dot notation 2015-02-05 11:22:42 -06:00
Blade Barringer dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer 3897266ba6 Removed trailing comma from .jshintrc 2015-02-05 11:15:01 -06:00
Blade Barringer 3f064ee1bf Merge pull request #4566 from Verabird/fixDateFormat 
Fix date format for charts (#4558)
 2015-02-04 21:59:00 -06:00
Tyler Renelle 63320d3fe7 refactor(tour): small cleanup 2015-02-04 19:40:06 -07:00
Tyler Renelle 3916346308 fix(tour): misc tour fixes. uses backdrop, next/prev (important we've 
found in user test vids), etc
 2015-02-04 18:55:29 -07:00
Verabird d7b0bd5b72 Add access to .User in MemberModalCtrl 2015-02-04 20:15:18 -05:00
Blade Barringer 28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Verabird fecba8f9f5 Shorten dateFormat string in graphs 2015-02-04 13:38:24 -05:00
Verabird 3cb182fb53 Add dateFormat choice to charts and other hardcoded MM/DD/YYYY 2015-02-04 13:38:24 -05:00
Blade Barringer 5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer aba56bd174 Moved hair files to correct location 2015-02-04 10:33:25 -06:00
Blade Barringer 5cf46f9f4a Corrected path for coverage 2015-02-04 10:26:54 -06:00
Blade Barringer 286e894e2f Removed package json from common 2015-02-04 10:21:23 -06:00
Blade Barringer a617bac139 Moved config.json.example to website folder 2015-02-04 10:18:42 -06:00
Blade Barringer 250249dc57 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-04 10:16:30 -06:00
Blade Barringer a6d3857a1d Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	common/public/habitrpg-shared.js
 2015-02-04 10:15:23 -06:00
Blade Barringer 5d0defc685 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/public/habitrpg-shared.js
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-02-04 10:14:11 -06:00
Matteo Pagliazzi 637928371b better browser monitoring 2015-02-04 17:03:18 +01:00
Matteo Pagliazzi 9227c7b3d3 add new relic browser agent 2015-02-04 16:50:54 +01:00
Blade Barringer ae36fc6890 Compiled sprite files 2015-02-04 09:29:40 -06:00
Blade Barringer bb00e9d97c Added new hair types 2015-02-04 09:26:22 -06:00
Tyler Renelle c3bb42b108 fix(auth): search case-insensitive usernames when registering 2015-02-03 21:45:17 -07:00
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