Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts: common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
No related branches found
No related tags found
Showing
- cms/djangoapps/contentstore/tests/tests.py 51 additions, 0 deletionscms/djangoapps/contentstore/tests/tests.py
- cms/djangoapps/contentstore/views.py 62 additions, 3 deletionscms/djangoapps/contentstore/views.py
- cms/static/coffee/files.json 5 additions, 2 deletionscms/static/coffee/files.json
- cms/static/coffee/src/views/tabs.coffee 15 additions, 1 deletioncms/static/coffee/src/views/tabs.coffee
- cms/static/js/models/settings/course_details.js 4 additions, 2 deletionscms/static/js/models/settings/course_details.js
- cms/static/js/views/course_info_edit.js 8 additions, 8 deletionscms/static/js/views/course_info_edit.js
- cms/static/js/views/server_error.js 4 additions, 0 deletionscms/static/js/views/server_error.js
- cms/static/js/views/settings/main_settings_view.js 59 additions, 49 deletionscms/static/js/views/settings/main_settings_view.js
- cms/templates/course_info.html 1 addition, 0 deletionscms/templates/course_info.html
- cms/templates/edit_subsection.html 0 additions, 4 deletionscms/templates/edit_subsection.html
- cms/templates/settings.html 1 addition, 0 deletionscms/templates/settings.html
- cms/urls.py 3 additions, 0 deletionscms/urls.py
- common/djangoapps/student/management/commands/pearson_dump.py 7 additions, 5 deletions...on/djangoapps/student/management/commands/pearson_dump.py
- common/lib/xmodule/jasmine_test_runner.html.erb 0 additions, 1 deletioncommon/lib/xmodule/jasmine_test_runner.html.erb
- common/lib/xmodule/xmodule/capa_module.py 1 addition, 0 deletionscommon/lib/xmodule/xmodule/capa_module.py
- common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html 123 additions, 0 deletions.../lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
- common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee 112 additions, 0 deletions...ule/xmodule/js/spec/combinedopenended/display_spec.coffee
- common/lib/xmodule/xmodule/js/spec/helper.coffee 0 additions, 1 deletioncommon/lib/xmodule/xmodule/js/spec/helper.coffee
- common/lib/xmodule/xmodule/modulestore/xml_exporter.py 22 additions, 0 deletionscommon/lib/xmodule/xmodule/modulestore/xml_exporter.py
- common/lib/xmodule/xmodule/open_ended_module.py 8 additions, 1 deletioncommon/lib/xmodule/xmodule/open_ended_module.py
Loading
Please register or sign in to comment