cahrens 8ace7fe57c Merge branch 'master' into bug/christina/studio ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-04-01 12:30:07 -04:00

..

features

Disabled pylint warnings for lettuce steps:

2013-03-26 11:46:31 -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

small pep8 pylint and superclass fixes

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

tests

Merge branch 'master' into bug/christina/studio

2013-04-01 12:30:07 -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

if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state.

2013-03-22 13:57:53 -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

Merge pull request #1743 from MITx/fix/will/bug_288

2013-04-01 07:22:20 -07: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

change submission history to be ordered by id

2013-03-29 21:16:20 -04:00