Merge pull request #3334 from edx/rc/2014-04-14
Rc/2014 04 14
Showing
- CHANGELOG.rst 6 additions, 0 deletionsCHANGELOG.rst
- cms/djangoapps/contentstore/features/common.py 11 additions, 7 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/html-editor.feature 47 additions, 3 deletionscms/djangoapps/contentstore/features/html-editor.feature
- cms/djangoapps/contentstore/features/html-editor.py 155 additions, 25 deletionscms/djangoapps/contentstore/features/html-editor.py
- cms/djangoapps/contentstore/features/transcripts.py 2 additions, 1 deletioncms/djangoapps/contentstore/features/transcripts.py
- cms/djangoapps/contentstore/features/upload.py 1 addition, 2 deletionscms/djangoapps/contentstore/features/upload.py
- cms/djangoapps/contentstore/features/video-editor.py 6 additions, 1 deletioncms/djangoapps/contentstore/features/video-editor.py
- cms/djangoapps/contentstore/features/video.feature 3 additions, 3 deletionscms/djangoapps/contentstore/features/video.feature
- cms/djangoapps/contentstore/features/video.py 10 additions, 7 deletionscms/djangoapps/contentstore/features/video.py
- cms/djangoapps/contentstore/views/item.py 2 additions, 3 deletionscms/djangoapps/contentstore/views/item.py
- cms/envs/aws.py 3 additions, 0 deletionscms/envs/aws.py
- cms/envs/common.py 23 additions, 1 deletioncms/envs/common.py
- cms/static/coffee/spec/main.coffee 6 additions, 5 deletionscms/static/coffee/spec/main.coffee
- cms/static/coffee/spec/main_squire.coffee 2 additions, 2 deletionscms/static/coffee/spec/main_squire.coffee
- cms/static/coffee/spec/views/overview_spec.coffee 0 additions, 348 deletionscms/static/coffee/spec/views/overview_spec.coffee
- cms/static/js/spec/utils/drag_and_drop_spec.js 313 additions, 0 deletionscms/static/js/spec/utils/drag_and_drop_spec.js
- cms/static/js/spec/utils/handle_iframe_binding_spec.js 13 additions, 5 deletionscms/static/js/spec/utils/handle_iframe_binding_spec.js
- cms/static/js/utils/drag_and_drop.js 346 additions, 0 deletionscms/static/js/utils/drag_and_drop.js
- cms/static/js/utils/handle_iframe_binding.js 4 additions, 1 deletioncms/static/js/utils/handle_iframe_binding.js
- cms/static/js/views/overview.js 5 additions, 344 deletionscms/static/js/views/overview.js
Loading
Please register or sign in to comment