Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -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

Fixed register button on edge homepage.

2014-05-22 12:09:23 +05:00

bulk_email

Address review comments

2014-05-14 09:37:38 -04:00

certificates

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

2014-05-22 10:52:00 -04:00

circuit

mitxmako => edxmako

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

class_dashboard

Fix dashboard data tests

2014-05-16 15:38:59 -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 pull request #3809 from cpennington/ok-dead-code

2014-05-21 16:21:17 -04:00

dashboard

Fix issues with psychometrics and git import

2014-05-16 11:47:14 -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

Added asserts to ensure course_ids are course key objects.

2014-05-21 17:20:56 -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

Fix management commands

2014-05-21 14:36:41 -04:00

instructor_task

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

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

licenses

fixup! Serial number commands deserialize course keys

2014-05-22 09:06:13 -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

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

2014-05-22 10:52:00 -04:00

notification_prefs

Notifier re-subcribe via link

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

open_ended_grading

Serialize course_key at last possible code junction

2014-05-20 11:58:03 -04:00

psychometrics

Fix PsychometricData query

2014-05-21 14:48:25 -04:00

shoppingcart

Fix failing tests from merge with master

2014-05-12 11:34:39 -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

Revert "Handle the indexerror exception on create_order"

2014-05-20 18:33:54 +05:00