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

..

management

Response to CR

2013-11-08 16:27:42 +00:00

migrations

Midcourse reverifications: dismissal banner

2014-01-31 22:20:32 +00:00

tests

Move to OpaqueKey implementations from the external library

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

__init__.py

Basic first commit of Photo ID Verification model and test code

2013-08-21 16:21:52 -04:00

admin.py

Moved reverification windows into common

2014-01-31 22:08:08 +00:00

api.py

Basic first commit of Photo ID Verification model and test code

2013-08-21 16:21:52 -04:00

exceptions.py

Tests and cleanup

2014-01-31 21:48:36 +00:00

models.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

ssencrypt.py

Clean up some old pep8/pylint violations

2013-09-24 17:12:31 -04:00

urls.py

Added trailing slashes otherwise the course_id regex sometimes eats up get parameters.

2014-05-26 15:50:23 +05:00

views.py

Merge branch 'release'

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