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

..

features

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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

management

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

2014-05-06 10:08:32 -04:00

migrations

Fix 0010 courseware migration

2013-11-20 20:39:40 -08:00

tests

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

Don't fetch the course just to find out if the user has access to it.

2014-05-09 10:12:21 -04:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

Validate the args to SSCK

2014-05-09 10:26:06 -04:00

grades.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

masquerade.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

model_data.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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

models.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

module_render.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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

progress.py

Cleaning up pep8 violations

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

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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