Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
Showing
- cms/djangoapps/contentstore/tests/test_course_updates.py 8 additions, 7 deletionscms/djangoapps/contentstore/tests/test_course_updates.py
- cms/djangoapps/contentstore/views.py 5 additions, 0 deletionscms/djangoapps/contentstore/views.py
- cms/static/coffee/src/views/module_edit.coffee 6 additions, 2 deletionscms/static/coffee/src/views/module_edit.coffee
- cms/static/js/base.js 39 additions, 24 deletionscms/static/js/base.js
- cms/static/js/views/settings/main_settings_view.js 9 additions, 4 deletionscms/static/js/views/settings/main_settings_view.js
- cms/static/sass/_courseware.scss 28 additions, 3 deletionscms/static/sass/_courseware.scss
- cms/static/sass/_unit.scss 8 additions, 3 deletionscms/static/sass/_unit.scss
- cms/templates/component.html 11 additions, 7 deletionscms/templates/component.html
- cms/templates/overview.html 1 addition, 1 deletioncms/templates/overview.html
- common/lib/xmodule/xmodule/course_module.py 22 additions, 0 deletionscommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/modulestore/__init__.py 1 addition, 1 deletioncommon/lib/xmodule/xmodule/modulestore/__init__.py
- common/lib/xmodule/xmodule/modulestore/mongo.py 1 addition, 1 deletioncommon/lib/xmodule/xmodule/modulestore/mongo.py
- common/lib/xmodule/xmodule/modulestore/xml.py 9 additions, 3 deletionscommon/lib/xmodule/xmodule/modulestore/xml.py
- common/lib/xmodule/xmodule/modulestore/xml_importer.py 60 additions, 35 deletionscommon/lib/xmodule/xmodule/modulestore/xml_importer.py
- common/static/js/vendor/timepicker/jquery.timepicker.css 6 additions, 7 deletionscommon/static/js/vendor/timepicker/jquery.timepicker.css
- common/static/js/vendor/timepicker/jquery.timepicker.js 167 additions, 79 deletionscommon/static/js/vendor/timepicker/jquery.timepicker.js
- common/static/js/vendor/timepicker/jquery.timepicker.min.js 1 addition, 1 deletioncommon/static/js/vendor/timepicker/jquery.timepicker.min.js
- lms/djangoapps/django_comment_client/utils.py 23 additions, 22 deletionslms/djangoapps/django_comment_client/utils.py
Loading
Please register or sign in to comment