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

..

__init__.py

Add initial openid_provider tests (covers xrds and authentication requests)

2013-01-22 11:15:30 -05:00

test_helper.py

Address @brianhw review comments

2013-09-06 15:37:27 -07:00

test_openid_provider.py

Clean up test conditions.

2013-12-13 09:11:00 -05:00

test_shib.py

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

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

test_ssl.py

Fix ssl redirection test

2014-05-13 14:13:45 -04:00