Will Daly 2436d59e14 Merge branch 'master' into feature/deena/testing ...

Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py

2013-03-04 16:30:41 -05:00

..

djangoapps

Merge branch 'master' into feature/deena/testing

2013-03-04 16:30:41 -05:00

envs

Merge branch 'master' into feature/deena/testing

2013-03-04 16:30:41 -05:00

static

Don't usurp ValidatingView's error handling.

2013-03-01 15:24:56 -05:00

templates

Merge pull request #1577 from MITx/bug/christina/misc

2013-03-01 12:09:20 -08:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

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

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

urls.py

Get Save and Cancel working.

2013-02-19 17:08:10 -05:00