JonahStanley 46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests ...

Conflicts:
	cms/envs/test.py

2013-06-17 16:43:56 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

acceptance.py

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

aws.py

read MKTG_URLS from env.json

2013-06-06 09:50:43 -04:00

common.py

I think we need to add the new assets.js into the PIPELIE

2013-06-17 11:10:36 -04:00

dev_ike.py

Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location

2013-05-21 09:34:12 -04:00

dev_with_worker.py

Add exceptions for unused imports in settings files

2013-05-21 13:07:04 -04:00

dev.py

add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan

2013-06-17 11:09:52 -04:00

jasmine.py

Record junit reports of jasmine tests

2013-05-22 22:01:44 -04:00

test.py

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-17 16:43:56 -04:00