Merge pull request #3460 from edx/release
Merging release back to master
No related branches found
No related tags found
Showing
- CHANGELOG.rst 3 additions, 0 deletionsCHANGELOG.rst
- cms/djangoapps/contentstore/features/component.feature 2 additions, 0 deletionscms/djangoapps/contentstore/features/component.feature
- cms/djangoapps/contentstore/features/component.py 2 additions, 0 deletionscms/djangoapps/contentstore/features/component.py
- cms/djangoapps/contentstore/features/html-editor.feature 61 additions, 2 deletionscms/djangoapps/contentstore/features/html-editor.feature
- cms/djangoapps/contentstore/features/html-editor.py 42 additions, 3 deletionscms/djangoapps/contentstore/features/html-editor.py
- cms/templates/widgets/html-edit.html 5 additions, 2 deletionscms/templates/widgets/html-edit.html
- common/lib/xmodule/xmodule/css/html/edit.scss 3 additions, 20 deletionscommon/lib/xmodule/xmodule/css/html/edit.scss
- common/lib/xmodule/xmodule/html_module.py 11 additions, 0 deletionscommon/lib/xmodule/xmodule/html_module.py
- common/lib/xmodule/xmodule/js/fixtures/html-edit-visual.html 10 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/html-edit-visual.html
- common/lib/xmodule/xmodule/js/fixtures/html-edit.html 0 additions, 3 deletionscommon/lib/xmodule/xmodule/js/fixtures/html-edit.html
- common/lib/xmodule/xmodule/js/fixtures/html-editor-raw.html 9 additions, 0 deletionscommon/lib/xmodule/xmodule/js/fixtures/html-editor-raw.html
- common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee 14 additions, 14 deletionscommon/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee
- common/lib/xmodule/xmodule/js/src/html/edit.coffee 80 additions, 51 deletionscommon/lib/xmodule/xmodule/js/src/html/edit.coffee
- common/lib/xmodule/xmodule/templates/html/raw.yaml 14 additions, 0 deletionscommon/lib/xmodule/xmodule/templates/html/raw.yaml
- lms/templates/static_templates/server-error.html 1 addition, 1 deletionlms/templates/static_templates/server-error.html
- lms/templates/widgets/html-edit.html 10 additions, 5 deletionslms/templates/widgets/html-edit.html
Loading
Please register or sign in to comment