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

..

migrations

The bulk of Shibboleth authentication for Stanford

2013-06-19 00:48:18 -07:00

tests

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

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

__init__.py

external_auth djangoapps files

2012-08-01 17:57:21 -04:00

admin.py

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

djangostore.py

Fix error on external_auth djangostore

2013-11-07 18:37:09 -05:00

models.py

Add a manage.py command that understands the extra edX options

2013-07-24 09:04:12 -04:00

views.py

Merge branch 'release'

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