resolve merge conflict with hotfix branch
No related branches found
No related tags found
Showing
- cms/templates/import.html 1 addition, 1 deletioncms/templates/import.html
- common/lib/xmodule/xmodule/css/video/display.scss 27 additions, 0 deletionscommon/lib/xmodule/xmodule/css/video/display.scss
- common/lib/xmodule/xmodule/js/fixtures/video.html 2 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/video.html
- common/lib/xmodule/xmodule/js/fixtures/video_all.html 2 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/video_all.html
- common/lib/xmodule/xmodule/js/fixtures/video_html5.html 2 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/video_html5.html
- common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html 2 additions, 0 deletions...on/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
- common/lib/xmodule/xmodule/js/spec/helper.coffee 14 additions, 2 deletionscommon/lib/xmodule/xmodule/js/spec/helper.coffee
- common/lib/xmodule/xmodule/js/spec/video/general_spec.js 16 additions, 44 deletionscommon/lib/xmodule/xmodule/js/spec/video/general_spec.js
- common/lib/xmodule/xmodule/js/src/video/01_initialize.js 89 additions, 27 deletionscommon/lib/xmodule/xmodule/js/src/video/01_initialize.js
- common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js 14 additions, 4 deletions...ib/xmodule/xmodule/js/src/video/08_video_speed_control.js
- common/lib/xmodule/xmodule/js/src/video/10_main.js 10 additions, 1 deletioncommon/lib/xmodule/xmodule/js/src/video/10_main.js
- common/lib/xmodule/xmodule/video_module.py 11 additions, 1 deletioncommon/lib/xmodule/xmodule/video_module.py
- lms/djangoapps/courseware/features/video.feature 27 additions, 6 deletionslms/djangoapps/courseware/features/video.feature
- lms/djangoapps/courseware/features/video.py 45 additions, 0 deletionslms/djangoapps/courseware/features/video.py
- lms/djangoapps/courseware/features/youtube_setup.py 45 additions, 0 deletionslms/djangoapps/courseware/features/youtube_setup.py
- lms/djangoapps/courseware/mock_youtube_server/__init__.py 0 additions, 0 deletionslms/djangoapps/courseware/mock_youtube_server/__init__.py
- lms/djangoapps/courseware/mock_youtube_server/mock_youtube_server.py 81 additions, 0 deletions...pps/courseware/mock_youtube_server/mock_youtube_server.py
- lms/djangoapps/courseware/mock_youtube_server/test_mock_youtube_server.py 53 additions, 0 deletions...ourseware/mock_youtube_server/test_mock_youtube_server.py
- lms/djangoapps/courseware/tests/test_video_mongo.py 6 additions, 2 deletionslms/djangoapps/courseware/tests/test_video_mongo.py
- lms/djangoapps/courseware/tests/test_video_xml.py 3 additions, 1 deletionlms/djangoapps/courseware/tests/test_video_xml.py
Loading
Please register or sign in to comment