Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into...
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy
No related branches found
No related tags found
Showing
- cms/djangoapps/contentstore/utils.py 1 addition, 1 deletioncms/djangoapps/contentstore/utils.py
- cms/djangoapps/contentstore/views.py 33 additions, 12 deletionscms/djangoapps/contentstore/views.py
- cms/static/js/base.js 54 additions, 11 deletionscms/static/js/base.js
- cms/static/sass/_courseware.scss 146 additions, 10 deletionscms/static/sass/_courseware.scss
- cms/templates/manage_users.html 1 addition, 1 deletioncms/templates/manage_users.html
- cms/templates/overview.html 19 additions, 9 deletionscms/templates/overview.html
- 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
Loading
Please register or sign in to comment