Will Daly 96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py

2013-08-21 10:12:24 -04:00

..

features

Merge pull request #710 from edx/jonahstanley/help-acceptance-test

2013-08-19 14:02:29 -07:00

management

Only quiet the particular logger we think is too noisy.

2013-07-18 11:53:21 -04:00

migrations

move test_tasks to test_integration.

2013-06-18 11:17:16 -04:00

mock_xqueue_server

small pep8 pylint and superclass fixes

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

tests

Merge branch 'master' into will/use-mixed-modulestore-in-tests

2013-08-21 10:12:24 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Merge branch 'master' into jnater/courseware_tests

2013-06-27 13:53:47 -04:00

admin.py

Limit the rate of logins.

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

courses.py

WIP

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

grades.py

in grading, if problem cannot be created, return score as none

2013-08-16 10:25:38 -04:00

masquerade.py

use ENABLE_MASQUERADE in masquerade.py

2013-04-13 22:52:17 -04:00

model_data.py

Provide implicit saves for XBlocks and XModules.

2013-07-18 16:37:34 -04:00

models.py

set task_id on LMS side.

2013-06-18 11:17:16 -04:00

module_render.py

fix missed conflict resolution

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

progress.py

Cleaning up pep8 violations

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

tabs.py

add instructor dash version switch

2013-08-02 09:52:13 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

get_items should take a course_id

2013-08-19 23:42:26 -04:00