Andy Armstrong 4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

2014-08-29 16:50:40 -04:00

..

features

Updating the footer for edx.org and open edx.

2014-08-25 15:33:43 +00:00

management

Fix all modulestore calls to pass in user ids.

2014-07-09 21:10:12 -04:00

migrations

Fix 0010 courseware migration

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

tests

Merge branch 'release' into andya/merge-hotfix-2014-08-29

2014-08-29 16:50:40 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional

2014-07-15 16:37:00 -04:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

Assume any non-xml modulestore is r/w

2014-08-21 12:11:27 -04:00

grades.py

Lower logging level in grading condition from exception to info

2014-06-23 16:50:28 -04:00

masquerade.py

settings.MITX_FEATURES => settings.FEATURES

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

model_data.py

Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes

2014-08-27 16:29:48 -04:00

models.py

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

module_render.py

add pyfs service

2014-08-25 12:25:03 -04:00

progress.py

Cleaning up pep8 violations

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

views.py

Refactor verify course id decorator and fixed tests.

2014-08-29 16:05:33 +05:00