ihoover 4148c00cc4 resolve conflicts

2013-07-23 16:26:11 -04:00

..

management

Fix all W0602, global used but no assignment done.

2013-06-21 17:33:23 -04:00

migrations

Modifications to instructor dashboard - enrollment tab:

2013-04-29 09:38:10 -07:00

tests

resolve conflicts

2013-07-23 16:26:11 -04:00

__init__.py

Move student app from lms to common

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

admin.py

Change wildcard imports into specific imports

2013-06-21 17:33:06 -04:00

forms.py

Tests + Now subclass PasswordResetForm instead of copy

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

models.py

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

views.py

moved MAX_AUTO_AUTH_USERS to ENV_TOKENS

2013-07-17 10:00:24 -04:00