Merge branch 'master' into cpennington/cms-editing
Showing
- common/lib/capa/capa_problem.py 33 additions, 1 deletioncommon/lib/capa/capa_problem.py
- common/lib/xmodule/capa_module.py 154 additions, 87 deletionscommon/lib/xmodule/capa_module.py
- common/lib/xmodule/progress.py 126 additions, 0 deletionscommon/lib/xmodule/progress.py
- common/lib/xmodule/seq_module.py 25 additions, 5 deletionscommon/lib/xmodule/seq_module.py
- common/lib/xmodule/tests.py 119 additions, 1 deletioncommon/lib/xmodule/tests.py
- common/lib/xmodule/vertical_module.py 9 additions, 0 deletionscommon/lib/xmodule/vertical_module.py
- common/lib/xmodule/x_module.py 19 additions, 0 deletionscommon/lib/xmodule/x_module.py
- lms/djangoapps/courseware/grades.py 2 additions, 0 deletionslms/djangoapps/courseware/grades.py
- lms/djangoapps/courseware/module_render.py 35 additions, 3 deletionslms/djangoapps/courseware/module_render.py
- lms/djangoapps/courseware/views.py 6 additions, 4 deletionslms/djangoapps/courseware/views.py
- lms/static/coffee/files.json 2 additions, 2 deletionslms/static/coffee/files.json
- lms/static/coffee/src/modules/problem.coffee 17 additions, 4 deletionslms/static/coffee/src/modules/problem.coffee
- lms/static/coffee/src/modules/sequence.coffee 56 additions, 3 deletionslms/static/coffee/src/modules/sequence.coffee
- lms/templates/dogfood.html 2 additions, 2 deletionslms/templates/dogfood.html
- lms/templates/marketing.html 2 additions, 2 deletionslms/templates/marketing.html
- lms/templates/quickedit.html 2 additions, 2 deletionslms/templates/quickedit.html
Please register or sign in to comment