Andy Armstrong 7b26e85478 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:10 -04:00

..

features

Bok-Choy Video Transcript tests Batch3

2014-08-28 09:10:13 +00:00

management

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

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

tests

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

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

views

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

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

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

context_processors.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-19 09:20:08 -04:00

course_info_model.py

split create_item and create_child out as separate methods

2014-07-18 21:11:37 -04:00

debug_file_uploader.py

some tweeks to the negative testing

2013-07-09 19:16:00 -04:00

git_export_utils.py

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00

tasks.py

Fix broken rerun test

2014-08-21 15:43:22 -04:00

utils.py

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

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