Calen Pennington 155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py

2014-05-09 15:29:32 -04:00

..

fixtures

Django-admin for Embargo feature

2014-02-27 08:38:05 -05:00

migrations

Tests for embargo middleware feature

2014-02-27 09:33:17 -05:00

tests

Merge remote-tracking branches 'edx/opaque-keys-base-keys', 'edx/opaque-keys-cms', 'edx/opaque-keys-common-djangoapps', 'edx/opaque-keys-common-lib-xmodule', 'edx/opaque-keys-common-misc', 'edx/opaque-keys-django-fields', 'edx/opaque-keys-embargo-tests', 'edx/opaque-keys-library', 'edx/opaque-keys-lms-courseware', 'edx/opaque-keys-lms-djangoapps', 'edx/opaque-keys-lms-templates', 'edx/opaque-keys-mongoengine-fields', 'edx/opaque-keys-requirements' and 'edx/opaque-keys-roles-table' into opaque-keys

2014-05-08 20:32:28 -04:00

__init__.py

Embargo Middleware feature

2014-02-27 08:37:58 -05:00

admin.py

Expose "enabled" checkbox in Embargo admin

2014-05-02 14:59:22 -04:00

forms.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00

middleware.py

Add logging to embargo middleware

2014-03-02 18:27:18 -05:00

models.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00