Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
No related branches found
No related tags found
Showing
- askbot 1 addition, 1 deletionaskbot
- cms/envs/common.py 2 additions, 1 deletioncms/envs/common.py
- cms/urls.py 1 addition, 1 deletioncms/urls.py
- common/djangoapps/util/json_request.py 1 addition, 1 deletioncommon/djangoapps/util/json_request.py
- common/djangoapps/util/middleware.py 0 additions, 16 deletionscommon/djangoapps/util/middleware.py
- lms/djangoapps/courseware/courses.py 1 addition, 1 deletionlms/djangoapps/courseware/courses.py
- lms/djangoapps/heartbeat/urls.py 1 addition, 1 deletionlms/djangoapps/heartbeat/urls.py
- lms/djangoapps/simplewiki/urls.py 1 addition, 1 deletionlms/djangoapps/simplewiki/urls.py
- lms/djangoapps/staticbook/views.py 4 additions, 2 deletionslms/djangoapps/staticbook/views.py
- lms/envs/common.py 4 additions, 2 deletionslms/envs/common.py
- lms/envs/dev_ike.py 5 additions, 0 deletionslms/envs/dev_ike.py
- lms/templates/book_toc.html 0 additions, 356 deletionslms/templates/book_toc.html
- lms/templates/book_toc.xml 413 additions, 0 deletionslms/templates/book_toc.xml
- lms/templates/staff_problem_info.html 3 additions, 7 deletionslms/templates/staff_problem_info.html
- lms/templates/staticbook.html 19 additions, 1 deletionlms/templates/staticbook.html
- lms/urls.py 1 addition, 1 deletionlms/urls.py
- requirements.txt 1 addition, 1 deletionrequirements.txt
Loading
Please register or sign in to comment