Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts: common/lib/capa/capa/responsetypes.py common/lib/xmodule/xmodule/js/src/html/display.coffee lms/envs/common.py
No related branches found
No related tags found
Showing
- common/djangoapps/external_auth/djangostore.py 123 additions, 0 deletionscommon/djangoapps/external_auth/djangostore.py
- common/djangoapps/external_auth/views.py 21 additions, 13 deletionscommon/djangoapps/external_auth/views.py
- common/djangoapps/status/__init__.py 1 addition, 0 deletionscommon/djangoapps/status/__init__.py
- common/djangoapps/status/status.py 43 additions, 0 deletionscommon/djangoapps/status/status.py
- common/djangoapps/status/tests.py 90 additions, 0 deletionscommon/djangoapps/status/tests.py
- common/djangoapps/student/management/commands/set_staff.py 37 additions, 0 deletionscommon/djangoapps/student/management/commands/set_staff.py
- common/djangoapps/student/views.py 50 additions, 23 deletionscommon/djangoapps/student/views.py
- common/lib/capa/capa/calc.py 19 additions, 9 deletionscommon/lib/capa/capa/calc.py
- common/lib/capa/capa/capa_problem.py 143 additions, 72 deletionscommon/lib/capa/capa/capa_problem.py
- common/lib/capa/capa/chem/__init__.py 1 addition, 0 deletionscommon/lib/capa/capa/chem/__init__.py
- common/lib/capa/capa/chem/chemcalc.py 433 additions, 0 deletionscommon/lib/capa/capa/chem/chemcalc.py
- common/lib/capa/capa/chem/tests.py 336 additions, 0 deletionscommon/lib/capa/capa/chem/tests.py
- common/lib/capa/capa/correctmap.py 40 additions, 18 deletionscommon/lib/capa/capa/correctmap.py
- common/lib/capa/capa/eia.py 7 additions, 1 deletioncommon/lib/capa/capa/eia.py
- common/lib/capa/capa/inputtypes.py 373 additions, 143 deletionscommon/lib/capa/capa/inputtypes.py
- common/lib/capa/capa/responsetypes.py 293 additions, 161 deletionscommon/lib/capa/capa/responsetypes.py
- common/lib/capa/capa/templates/chemicalequationinput.html 40 additions, 0 deletionscommon/lib/capa/capa/templates/chemicalequationinput.html
- common/lib/capa/capa/templates/crystallography.html 51 additions, 0 deletionscommon/lib/capa/capa/templates/crystallography.html
- common/lib/capa/capa/templates/textbox.html 8 additions, 3 deletionscommon/lib/capa/capa/templates/textbox.html
- common/lib/capa/capa/tests/__init__.py 21 additions, 0 deletionscommon/lib/capa/capa/tests/__init__.py
Loading
Please register or sign in to comment