Merge branch 'master' into cale/circular-import-fix
Conflicts: common/djangoapps/student/models.py
No related branches found
No related tags found
Showing
- common/djangoapps/student/admin.py 2 additions, 0 deletionscommon/djangoapps/student/admin.py
- common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py 155 additions, 0 deletions...enrollmentallowed__add_unique_courseenrollmentallowed_.py
- common/djangoapps/student/models.py 17 additions, 0 deletionscommon/djangoapps/student/models.py
- common/djangoapps/student/views.py 1 addition, 1 deletioncommon/djangoapps/student/views.py
- common/lib/capa/capa/capa_problem.py 0 additions, 18 deletionscommon/lib/capa/capa/capa_problem.py
- common/lib/capa/capa/inputtypes.py 0 additions, 48 deletionscommon/lib/capa/capa/inputtypes.py
- common/lib/capa/capa/responsetypes.py 1 addition, 432 deletionscommon/lib/capa/capa/responsetypes.py
- common/lib/capa/capa/templates/openendedinput.html 0 additions, 56 deletionscommon/lib/capa/capa/templates/openendedinput.html
- common/lib/xmodule/setup.py 2 additions, 1 deletioncommon/lib/xmodule/setup.py
- common/lib/xmodule/xmodule/capa_module.py 1 addition, 15 deletionscommon/lib/xmodule/xmodule/capa_module.py
- common/lib/xmodule/xmodule/combined_open_ended_module.py 598 additions, 0 deletionscommon/lib/xmodule/xmodule/combined_open_ended_module.py
- common/lib/xmodule/xmodule/combined_open_ended_rubric.py 129 additions, 0 deletionscommon/lib/xmodule/xmodule/combined_open_ended_rubric.py
- common/lib/xmodule/xmodule/course_module.py 36 additions, 5 deletionscommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/css/combinedopenended/display.scss 626 additions, 0 deletions...on/lib/xmodule/xmodule/css/combinedopenended/display.scss
- common/lib/xmodule/xmodule/gst_module.py 195 additions, 0 deletionscommon/lib/xmodule/xmodule/gst_module.py
- common/lib/xmodule/xmodule/js/src/capa/display.coffee 0 additions, 30 deletionscommon/lib/xmodule/xmodule/js/src/capa/display.coffee
- common/lib/xmodule/xmodule/js/src/collapsible.coffee 1 addition, 1 deletioncommon/lib/xmodule/xmodule/js/src/collapsible.coffee
- common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee 282 additions, 0 deletions...b/xmodule/xmodule/js/src/combinedopenended/display.coffee
- common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js 139 additions, 0 deletions...xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
- common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js 113 additions, 0 deletions...xmodule/js/src/graphical_slider_tool/g_label_el_output.js
Loading
Please register or sign in to comment