Merge branch 'master' into feature/rocha/wiki-cheatsheet
Showing
- common/djangoapps/mitxmako/middleware.py 1 addition, 1 deletioncommon/djangoapps/mitxmako/middleware.py
- common/djangoapps/student/models.py 1 addition, 1 deletioncommon/djangoapps/student/models.py
- common/djangoapps/student/views.py 1 addition, 1 deletioncommon/djangoapps/student/views.py
- common/lib/capa/capa/correctmap.py 6 additions, 4 deletionscommon/lib/capa/capa/correctmap.py
- common/lib/xmodule/xmodule/css/sequence/display.scss 32 additions, 23 deletionscommon/lib/xmodule/xmodule/css/sequence/display.scss
- common/lib/xmodule/xmodule/js/src/sequence/display.coffee 1 addition, 0 deletionscommon/lib/xmodule/xmodule/js/src/sequence/display.coffee
- doc/xml-format.md 264 additions, 106 deletionsdoc/xml-format.md
- lms/djangoapps/courseware/courses.py 8 additions, 2 deletionslms/djangoapps/courseware/courses.py
- lms/djangoapps/courseware/module_render.py 12 additions, 6 deletionslms/djangoapps/courseware/module_render.py
- lms/djangoapps/courseware/views.py 6 additions, 3 deletionslms/djangoapps/courseware/views.py
- lms/djangoapps/django_comment_client/base/views.py 18 additions, 14 deletionslms/djangoapps/django_comment_client/base/views.py
- lms/djangoapps/django_comment_client/forum/views.py 9 additions, 9 deletionslms/djangoapps/django_comment_client/forum/views.py
- lms/djangoapps/django_comment_client/utils.py 25 additions, 8 deletionslms/djangoapps/django_comment_client/utils.py
- lms/envs/aws.py 9 additions, 2 deletionslms/envs/aws.py
- lms/envs/common.py 2 additions, 0 deletionslms/envs/common.py
- lms/envs/dev_ike.py 2 additions, 0 deletionslms/envs/dev_ike.py
- lms/lib/comment_client/user.py 0 additions, 10 deletionslms/lib/comment_client/user.py
- lms/static/coffee/src/discussion/content.coffee 28 additions, 9 deletionslms/static/coffee/src/discussion/content.coffee
- lms/static/coffee/src/discussion/discussion.coffee 9 additions, 1 deletionlms/static/coffee/src/discussion/discussion.coffee
- lms/static/coffee/src/discussion/discussion_module.coffee 1 addition, 1 deletionlms/static/coffee/src/discussion/discussion_module.coffee
Please register or sign in to comment