Don Mitchell a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-11-19 16:00:27 -05:00

..

djangoapps

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

envs

Add test for clone item. Also change password hashing for faster tests.

2012-11-09 10:54:50 -05:00

static

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

templates

Everything tested and ready for Tom to fix

2012-11-19 10:38:58 -05: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

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00