Chris Dodge 7bdc4c5134 fix errant conflict resolution

2013-08-15 22:58:03 -04:00

..

management

Merge pull request #666 from edx/jarv/add-get-grades

2013-08-14 11:42:51 -07:00

migrations

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

tests

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

__init__.py

Move student app from lms to common

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

admin.py

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

forms.py

Tests + Now subclass PasswordResetForm instead of copy

2013-06-24 11:54:31 -07:00

models.py

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

views.py

fix errant conflict resolution

2013-08-15 22:58:03 -04:00