Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04:00

..

management

Move to OpaqueKey implementations from the external library

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

migrations

Correct UnboundLocalError exception in student_migration_35

2014-08-05 11:51:49 -04:00

tests

Merge branch 'release'

2014-09-25 16:25:45 -04:00

__init__.py

Move student app from lms to common

2012-07-13 11:51:32 -04:00

admin.py

make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list

2014-07-17 12:04:56 -04:00

auth.py

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

2014-05-09 15:29:32 -04:00

forms.py

Moved reverification windows into common

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

middleware.py

add functionality to disable users

2013-10-16 16:57:11 -04:00

models.py

Merge pull request #5328 from edx/flowerhack/auto-login

2014-09-25 10:40:33 -04:00

roles.py

Response to CR

2014-09-24 21:20:49 +00:00

views.py

Merge branch 'release'

2014-09-25 16:25:45 -04:00