John Jarvis 7023eb4c19 resolving merge conflicts

2014-07-21 13:42:06 -04:00

..

management

Move to OpaqueKey implementations from the external library

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

migrations

sql migrations cannot use loc mapper

2014-07-16 09:21:25 -04:00

tests

add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob

2014-07-14 09:36:28 -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

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

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

resolving merge conflicts

2014-07-21 13:42:06 -04:00