Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -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

Skip invalid test when in CMS

2014-09-23 12:02:31 -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

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04:00

roles.py

asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS

2014-07-10 09:35:32 -04:00

views.py

Puts course listings in a sane order

2014-09-23 12:02:30 -04:00