Merge pull request #12533 from edx/rc/2016-05-24
Release Candidate rc/2016-05-24
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- AUTHORS 1 addition, 0 deletionsAUTHORS
- cms/djangoapps/contentstore/features/component.py 4 additions, 1 deletioncms/djangoapps/contentstore/features/component.py
- cms/djangoapps/contentstore/views/preview.py 13 additions, 15 deletionscms/djangoapps/contentstore/views/preview.py
- cms/djangoapps/contentstore/views/tests/test_group_configurations.py 9 additions, 16 deletions...pps/contentstore/views/tests/test_group_configurations.py
- cms/envs/aws.py 3 additions, 0 deletionscms/envs/aws.py
- cms/envs/common.py 7 additions, 3 deletionscms/envs/common.py
- cms/envs/test.py 8 additions, 1 deletioncms/envs/test.py
- cms/lib/xblock/tagging/tagging.py 11 additions, 2 deletionscms/lib/xblock/tagging/tagging.py
- cms/static/js/i18n/eo/djangojs.js 1 addition, 0 deletionscms/static/js/i18n/eo/djangojs.js
- cms/static/js/i18n/es-419/djangojs.js 52 additions, 1 deletioncms/static/js/i18n/es-419/djangojs.js
- cms/static/js/i18n/fake2/djangojs.js 1 addition, 0 deletionscms/static/js/i18n/fake2/djangojs.js
- cms/static/js/i18n/rtl/djangojs.js 1 addition, 0 deletionscms/static/js/i18n/rtl/djangojs.js
- cms/static/js/i18n/zh-cn/djangojs.js 35 additions, 35 deletionscms/static/js/i18n/zh-cn/djangojs.js
- cms/static/js/spec/views/settings/main_spec.js 2 additions, 1 deletioncms/static/js/spec/views/settings/main_spec.js
- cms/static/js/views/settings/main.js 16 additions, 1 deletioncms/static/js/views/settings/main.js
- cms/templates/js/course-instructor-details.underscore 2 additions, 2 deletionscms/templates/js/course-instructor-details.underscore
- cms/templates/settings.html 35 additions, 19 deletionscms/templates/settings.html
- common/djangoapps/cache_toolbox/middleware.py 27 additions, 1 deletioncommon/djangoapps/cache_toolbox/middleware.py
- common/djangoapps/cache_toolbox/tests/test_middleware.py 46 additions, 0 deletionscommon/djangoapps/cache_toolbox/tests/test_middleware.py
Loading
Please register or sign in to comment