Will Daly 6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests ...

Conflicts:
	lms/djangoapps/courseware/features/problems.py

2013-03-21 10:49:04 -04:00

..

features

Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests

2013-03-21 10:49:04 -04:00

management

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-13 12:18:04 -04:00

migrations

Reorderd xmodule storage migrations

2013-03-06 08:45:32 -05:00

mock_xqueue_server

Added __init__.py and test_mock_xqueue_server.py,

2013-03-20 11:18:41 -04:00

tests

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

admin.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

courses.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

grades.py

Remove trailing whitespace

2013-03-19 10:41:38 -04:00

model_data.py

Only use .pk for queries, and not on inserts

2013-03-20 13:24:25 -04:00

models.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

module_render.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

progress.py

Cleaning up pep8 violations

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

tabs.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00