Calen Pennington 171e932266 Merge branch 'master' into feature/cale/cms-master ...

Conflicts:
	rakefile

2012-11-08 12:28:40 -05:00

..

djangoapps

Merge pull request #1018 from MITx/fix/cdodge/delete-last-component-does-not-stick

2012-11-08 05:52:02 -08:00

envs

Merge branch 'master' into feature/cale/cms-master

2012-11-08 12:28:40 -05:00

static

Merge pull request #997 from MITx/feature/cale/js-tests

2012-11-08 06:44:49 -08:00

templates

Merge pull request #997 from MITx/feature/cale/js-tests

2012-11-08 06:44:49 -08:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

Move jasmine tests to their own environment

2012-10-30 10:58:38 -04:00