Merge branch 'master' into feature/btalbot/studio-softlanding
No related branches found
Showing
- cms/djangoapps/contentstore/tests/test_contentstore.py 3 additions, 3 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/views.py 1 addition, 1 deletioncms/djangoapps/contentstore/views.py
- cms/static/img/html-icon.png 0 additions, 0 deletionscms/static/img/html-icon.png
- cms/static/img/large-discussion-icon.png 0 additions, 0 deletionscms/static/img/large-discussion-icon.png
- cms/static/img/large-freeform-icon.png 0 additions, 0 deletionscms/static/img/large-freeform-icon.png
- cms/static/img/large-problem-icon.png 0 additions, 0 deletionscms/static/img/large-problem-icon.png
- cms/static/img/large-video-icon.png 0 additions, 0 deletionscms/static/img/large-video-icon.png
- cms/static/sass/_reset.scss 114 additions, 0 deletionscms/static/sass/_reset.scss
- cms/static/sass/_unit.scss 124 additions, 27 deletionscms/static/sass/_unit.scss
- cms/templates/unit.html 69 additions, 33 deletionscms/templates/unit.html
- cms/templates/widgets/problem-edit.html 9 additions, 9 deletionscms/templates/widgets/problem-edit.html
- common/lib/xmodule/xmodule/capa_module.py 5 additions, 5 deletionscommon/lib/xmodule/xmodule/capa_module.py
- common/lib/xmodule/xmodule/html_module.py 7 additions, 0 deletionscommon/lib/xmodule/xmodule/html_module.py
- common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js 9 additions, 0 deletions.../xmodule/xmodule/js/src/videoalpha/display/html5_video.js
- common/lib/xmodule/xmodule/templates/html/empty.yaml 2 additions, 1 deletioncommon/lib/xmodule/xmodule/templates/html/empty.yaml
- common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml 2 additions, 1 deletion...b/xmodule/xmodule/templates/problem/circuitschematic.yaml
- common/lib/xmodule/xmodule/templates/problem/customgrader.yaml 2 additions, 2 deletions...n/lib/xmodule/xmodule/templates/problem/customgrader.yaml
- common/lib/xmodule/xmodule/templates/problem/empty.yaml 2 additions, 1 deletioncommon/lib/xmodule/xmodule/templates/problem/empty.yaml
- common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml 13 additions, 0 deletions.../lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
- common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml 2 additions, 2 deletions...b/xmodule/xmodule/templates/problem/forumularesponse.yaml
Loading
Please register or sign in to comment