Commit Graph

8275 Commits

Author SHA1 Message Date
Blade Barringer 0f45b1d8dd Corrected path to habitrpg. Added grunt-browserify 2015-02-09 13:17:19 -06:00
Blade Barringer 0ebb9c874b Worked on gruntfile 2015-02-08 20:19:54 -06:00
Blade Barringer 157a635a0c Restored Grunt tasks 2015-02-06 21:13:26 -06:00
Blade Barringer 71a2382b67 Added grunt tasks back in 2015-02-06 20:58:38 -06:00
Blade Barringer 1dfdffd51f Removed converted grunt tasks 2015-02-06 16:05:55 -06:00
Blade Barringer 6cf1ce7f67 Wrote copy task 2015-02-06 16:05:06 -06:00
Blade Barringer 1846dacd5f Used event-stream for stylus task 2015-02-06 15:13:18 -06:00
Blade Barringer 4339fd7982 Simplified stylus task 2015-02-06 10:50:18 -06:00
Blade Barringer 12ae9957ad Corrected paths on gulp tasks 2015-02-05 20:39:45 -06:00
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