Sarina Canelake 2aea261d48 Merge branch 'release' ...

Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py

2014-06-10 16:59:23 -04:00

..

features

Merge branch 'release'

2014-06-10 16:59:23 -04:00

management

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

tests

Merge branch 'release'

2014-06-10 16:59:23 -04:00

views

Merge branch 'release'

2014-06-10 16:59:23 -04:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

context_processors.py

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

2014-05-19 09:20:08 -04:00

course_info_model.py

Tweaks course update html to avoid using list tags inappropriately.

2014-02-26 13:28:00 -05:00

debug_file_uploader.py

some tweeks to the negative testing

2013-07-09 19:16:00 -04:00

git_export_utils.py

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

2014-05-07 12:56:43 -04:00

utils.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00