Merge pull request #2899 from edx/alex/multiple_transcripts_editor
Alex/multiple transcripts editor
Showing
- CHANGELOG.rst 2 additions, 0 deletionsCHANGELOG.rst
- cms/djangoapps/contentstore/features/common.py 7 additions, 2 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/component_settings_editor_helpers.py 1 addition, 1 deletion...ontentstore/features/component_settings_editor_helpers.py
- cms/djangoapps/contentstore/features/textbooks.py 1 addition, 1 deletioncms/djangoapps/contentstore/features/textbooks.py
- cms/djangoapps/contentstore/features/transcripts.feature 12 additions, 12 deletionscms/djangoapps/contentstore/features/transcripts.feature
- cms/djangoapps/contentstore/features/transcripts.py 1 addition, 1 deletioncms/djangoapps/contentstore/features/transcripts.py
- cms/djangoapps/contentstore/features/video-editor.feature 195 additions, 0 deletionscms/djangoapps/contentstore/features/video-editor.feature
- cms/djangoapps/contentstore/features/video-editor.py 227 additions, 2 deletionscms/djangoapps/contentstore/features/video-editor.py
- cms/djangoapps/contentstore/tests/test_transcripts_utils.py 13 additions, 0 deletionscms/djangoapps/contentstore/tests/test_transcripts_utils.py
- cms/djangoapps/contentstore/views/tests/test_transcripts.py 9 additions, 9 deletionscms/djangoapps/contentstore/views/tests/test_transcripts.py
- cms/djangoapps/contentstore/views/transcripts_ajax.py 3 additions, 3 deletionscms/djangoapps/contentstore/views/transcripts_ajax.py
- cms/static/coffee/spec/main.coffee 3 additions, 3 deletionscms/static/coffee/spec/main.coffee
- cms/static/coffee/spec/main_squire.coffee 2 additions, 1 deletioncms/static/coffee/spec/main_squire.coffee
- cms/static/coffee/spec/models/upload_spec.coffee 18 additions, 5 deletionscms/static/coffee/spec/models/upload_spec.coffee
- cms/static/coffee/spec/views/upload_spec.coffee 1 addition, 0 deletionscms/static/coffee/spec/views/upload_spec.coffee
- cms/static/js/models/uploads.js 30 additions, 9 deletionscms/static/js/models/uploads.js
- cms/static/js/spec/video/transcripts/editor_spec.js 2 additions, 2 deletionscms/static/js/spec/video/transcripts/editor_spec.js
- cms/static/js/spec/video/transcripts/file_uploader_spec.js 3 additions, 3 deletionscms/static/js/spec/video/transcripts/file_uploader_spec.js
- cms/static/js/spec/video/transcripts/message_manager_spec.js 4 additions, 4 deletionscms/static/js/spec/video/transcripts/message_manager_spec.js
- cms/static/js/spec/video/transcripts/utils_spec.js 1 addition, 1 deletioncms/static/js/spec/video/transcripts/utils_spec.js
Loading
Please register or sign in to comment