Merge branch 'release'
Showing
- CHANGELOG.rst 4 additions, 0 deletionsCHANGELOG.rst
- cms/envs/common.py 1 addition, 0 deletionscms/envs/common.py
- cms/static/js/views/assets.js 90 additions, 0 deletionscms/static/js/views/assets.js
- cms/templates/asset_index.html 2 additions, 90 deletionscms/templates/asset_index.html
- cms/templates/component.html 0 additions, 1 deletioncms/templates/component.html
- common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee 7 additions, 3 deletions...e/src/discussion/views/discussion_thread_list_view.coffee
- lms/djangoapps/course_wiki/views.py 1 addition, 1 deletionlms/djangoapps/course_wiki/views.py
- lms/static/sass/_discussion.scss 5 additions, 1 deletionlms/static/sass/_discussion.scss
- lms/templates/discussion/_filter_dropdown.html 2 additions, 1 deletionlms/templates/discussion/_filter_dropdown.html
- lms/templates/discussion/_inline_new_post.html 5 additions, 3 deletionslms/templates/discussion/_inline_new_post.html
- lms/templates/discussion/_new_post.html 15 additions, 14 deletionslms/templates/discussion/_new_post.html
- lms/templates/discussion/_single_thread.html 1 addition, 1 deletionlms/templates/discussion/_single_thread.html
- lms/templates/discussion/_thread_list_template.html 12 additions, 7 deletionslms/templates/discussion/_thread_list_template.html
- lms/templates/discussion/_underscore_templates.html 15 additions, 11 deletionslms/templates/discussion/_underscore_templates.html
- lms/templates/discussion/mustache/_content.mustache 1 addition, 1 deletionlms/templates/discussion/mustache/_content.mustache
- lms/templates/discussion/mustache/_inline_thread_show.mustache 1 addition, 1 deletion...emplates/discussion/mustache/_inline_thread_show.mustache
- lms/templates/discussion/mustache/_profile_thread.mustache 1 addition, 1 deletionlms/templates/discussion/mustache/_profile_thread.mustache
cms/static/js/views/assets.js
0 → 100644
Please register or sign in to comment