cahrens f91060d197 Merge branch 'master' into feature/cas/manual-policy ...

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py

2013-02-19 13:27:35 -05:00

..

__init__.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

factories.py

Pep8 autofixes

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

test_contentstore.py

Merge branch 'master' into feature/btalbot/studio-softlanding

2013-02-15 13:14:46 -05:00

test_core_caching.py

Pep8 autofixes

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

test_course_settings.py

Merge branch 'master' into feature/cas/manual-policy

2013-02-19 13:27:35 -05:00

test_course_updates.py

Pep8 autofixes

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

test_utils.py

Pep8 autofixes

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

tests.py

Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates

2013-02-13 06:29:35 -08:00

utils.py

We no longer need override_settings, Django has a better one.

2013-02-11 17:06:35 -05:00