e0d d52b959ff1 fixing merge conflicts

2013-12-16 15:02:14 -05:00

..

features

Fix tests.

2013-12-11 13:28:33 +02:00

management

Add sysadmin dashboard

2013-12-15 19:06:05 -05:00

migrations

Fix 0010 courseware migration

2013-11-20 20:39:40 -08:00

mock_lti_server

Add grading functionality to LTI xmodule

2013-11-26 16:30:55 -05:00

mock_xqueue_server

small pep8 pylint and superclass fixes

2013-03-29 10:41:27 -04:00

tests

Merge pull request #1907 from edx/db/whitespace-fixes

2013-12-13 11:40:54 -08:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

admin.py

Limit the rate of logins.

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

courses.py

fixes Edit Course In Studio link on instr dash (LMS-1455)

2013-11-08 15:42:51 -05:00

grades.py

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

masquerade.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

model_data.py

Make FieldDataCache use the user from scope_ids, rather than its pre-configured user

2013-11-26 16:29:35 -05:00

models.py

Remove code related to Pearson Testing Centers

2013-11-26 17:04:19 -05:00

module_render.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

roles.py

Reduce sql queries for groupname tests.

2013-12-13 14:33:11 -05:00

tabs.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

Create explicit Locations.

2013-12-12 14:37:00 -05:00