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

..

migrations

The bulk of Shibboleth authentication for Stanford

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

tests

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

2014-05-22 10:52:00 -04: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 remote-tracking branch 'edx/master' into opaque-keys

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