Chris Dodge 7229a9cdaf perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

..

djangoapps

Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup

2012-11-29 06:49:28 -08:00

envs

Make jasmine testing quieter

2012-11-13 10:55:17 -05:00

static

Merge pull request #1089 from MITx/feature/studio/tom/speedups

2012-11-30 08:55:31 -08:00

templates

Merge pull request #1089 from MITx/feature/studio/tom/speedups

2012-11-30 08:55:31 -08:00

__init__.py

Initial port of templates into filesystem based storage

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

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit

2012-11-08 09:55:56 -05:00