Merge branch 'release'
Showing
- cms/djangoapps/contentstore/features/video_editor.py 1 addition, 0 deletionscms/djangoapps/contentstore/features/video_editor.py
- common/lib/xmodule/xmodule/modulestore/__init__.py 3 additions, 1 deletioncommon/lib/xmodule/xmodule/modulestore/__init__.py
- common/lib/xmodule/xmodule/modulestore/mongo/base.py 25 additions, 4 deletionscommon/lib/xmodule/xmodule/modulestore/mongo/base.py
- common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py 6 additions, 1 deletion...odule/xmodule/modulestore/split_mongo/mongo_connection.py
- common/lib/xmodule/xmodule/modulestore/split_mongo/split.py 24 additions, 6 deletionscommon/lib/xmodule/xmodule/modulestore/split_mongo/split.py
- common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py 73 additions, 4 deletionscommon/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
- common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py 48 additions, 0 deletions...odule/xmodule/modulestore/tests/test_split_modulestore.py
- common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py 2 additions, 1 deletion...dulestore/tests/test_split_modulestore_bulk_operations.py
- common/lib/xmodule/xmodule/video_module/video_xfields.py 9 additions, 0 deletionscommon/lib/xmodule/xmodule/video_module/video_xfields.py
- common/test/acceptance/pages/studio/video/video.py 1 addition, 0 deletionscommon/test/acceptance/pages/studio/video/video.py
- lms/djangoapps/branding/__init__.py 4 additions, 3 deletionslms/djangoapps/branding/__init__.py
- lms/djangoapps/mobile_api/video_outlines/serializers.py 22 additions, 4 deletionslms/djangoapps/mobile_api/video_outlines/serializers.py
- lms/djangoapps/mobile_api/video_outlines/tests.py 43 additions, 0 deletionslms/djangoapps/mobile_api/video_outlines/tests.py
- lms/static/sass/views/_login-register.scss 4 additions, 0 deletionslms/static/sass/views/_login-register.scss
Please register or sign in to comment