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

..

analytics

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

2014-05-08 12:09:23 -04:00

branding

Merge pull request #2738 from edx/dbarch/mixed_ms_router

2014-03-05 17:17:07 -05:00

bulk_email

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

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

certificates

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

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

circuit

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

class_dashboard

Revert StudentModule.module_state_key to field rather than computed property

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

course_wiki

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

2014-05-08 12:09:23 -04:00

courseware

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

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

dashboard

Make dashboard.tests a python module

2014-05-09 09:23:52 -04:00

debug

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

2014-05-08 12:09:23 -04:00

django_comment_client

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

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

foldit

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

2014-05-08 12:09:23 -04:00

instructor

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

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

instructor_task

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

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

licenses

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

2014-05-08 12:09:23 -04:00

linkedin

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

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

lms_migration

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

2014-05-08 12:09:23 -04:00

multicourse

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05:00

notes

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

2014-05-08 12:09:23 -04:00

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

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

2014-05-08 12:09:23 -04:00

psychometrics

Revert StudentModule.module_state_key to field rather than computed property

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

shoppingcart

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

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

static_template_view

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

staticbook

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

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

verify_student

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

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