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

StaffFactories accept course_keys, not courses. Make that clear in the interface.

2014-05-24 19:36:18 -04:00

management

Change Location, CourseLocator, etc to reference opaque-keys library

2014-05-30 20:32:38 +00:00

tests

Merge pull request #3196 from mtyaka/enrollment-emails-http

2014-05-30 09:30:43 -04:00

views

Merge branch 'release'

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

__init__.py

move instructor dashboard into its own lms djangoapp; add new

2012-09-02 19:05:34 -04:00

access.py

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

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

enrollment.py

Don't hardcode https protocol in enrollment emails.

2014-05-28 22:44:42 +02:00

hint_manager.py

Move to OpaqueKey implementations from the external library

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

offline_gradecalc.py

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

utils.py

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

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