Don Mitchell 9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ...

Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html

2013-02-07 14:56:48 -05:00

..

djangoapps

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

envs

Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic

2013-02-05 10:32:54 -08:00

static

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-07 14:56:48 -05:00

templates

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-07 14:56:48 -05:00

__init__.py

Initial port of templates into filesystem based storage

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

.coveragerc

Make lms and cms coverage reports cover common/djangoapps

2013-02-05 11:06:46 -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

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00