Will Daly 342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests ...

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

2013-05-16 11:21:59 -04:00

..

assets.rake

Make the externally facing asset watch commands wait for user intervention, and add internal tasks that only run as long as the rake process

2013-05-15 15:25:42 -04:00

deploy.rake

Split rake file into smaller, more manageable pieces

2013-05-15 15:25:35 -04:00

django.rake

Install python prereqs before trying to run django or install requirements/local.txt

2013-05-15 15:49:51 -04:00

docs.rake

Split rake file into smaller, more manageable pieces

2013-05-15 15:25:35 -04:00

helpers.rb

Be more graceful when terminating background processes

2013-05-15 15:25:42 -04:00

i18n.rake

Split rake file into smaller, more manageable pieces

2013-05-15 15:25:35 -04:00

jasmine.rake

Split rake file into smaller, more manageable pieces

2013-05-15 15:25:35 -04:00

prereqs.rake

Add mechanism for running migrations of developer workspaces

2013-05-15 15:25:41 -04:00

quality.rake

Install prereqs before running pep8 or pylint

2013-05-15 15:25:41 -04:00

tests.rake

Merge branch 'master' into feature/will/ci-lettuce-tests

2013-05-16 11:21:59 -04:00

workspace.rake

Add mechanism for running migrations of developer workspaces

2013-05-15 15:25:41 -04:00