Merge pull request #7087 from edx/rc/2015-02-26
Rc/2015 02 26
Showing
- AUTHORS 1 addition, 0 deletionsAUTHORS
- cms/djangoapps/contentstore/views/component.py 0 additions, 1 deletioncms/djangoapps/contentstore/views/component.py
- cms/djangoapps/contentstore/views/course.py 182 additions, 51 deletionscms/djangoapps/contentstore/views/course.py
- cms/djangoapps/contentstore/views/tests/test_group_configurations.py 267 additions, 10 deletions...pps/contentstore/views/tests/test_group_configurations.py
- cms/djangoapps/contentstore/views/xblock.py 1 addition, 1 deletioncms/djangoapps/contentstore/views/xblock.py
- cms/envs/aws.py 1 addition, 0 deletionscms/envs/aws.py
- cms/static/js/factories/group_configurations.js 1 addition, 0 deletionscms/static/js/factories/group_configurations.js
- cms/static/js/models/group.js 13 additions, 3 deletionscms/static/js/models/group.js
- cms/static/js/spec/models/group_configuration_spec.js 8 additions, 4 deletionscms/static/js/spec/models/group_configuration_spec.js
- cms/static/js/spec/video/transcripts/file_uploader_spec.js 2 additions, 1 deletioncms/static/js/spec/video/transcripts/file_uploader_spec.js
- cms/static/js/spec/video/transcripts/message_manager_spec.js 2 additions, 1 deletioncms/static/js/spec/video/transcripts/message_manager_spec.js
- cms/static/js/spec/views/group_configuration_spec.js 354 additions, 131 deletionscms/static/js/spec/views/group_configuration_spec.js
- cms/static/js/spec/views/pages/group_configurations_spec.js 1 addition, 1 deletioncms/static/js/spec/views/pages/group_configurations_spec.js
- cms/static/js/views/content_group_details.js 73 additions, 7 deletionscms/static/js/views/content_group_details.js
- cms/static/js/views/content_group_editor.js 2 additions, 0 deletionscms/static/js/views/content_group_editor.js
- cms/static/js/views/content_group_item.js 17 additions, 2 deletionscms/static/js/views/content_group_item.js
- cms/static/sass/views/_group-configuration.scss 46 additions, 42 deletionscms/static/sass/views/_group-configuration.scss
- cms/templates/group_configurations.html 2 additions, 1 deletioncms/templates/group_configurations.html
- cms/templates/js/content-group-details.underscore 48 additions, 3 deletionscms/templates/js/content-group-details.underscore
- cms/templates/js/content-group-editor.underscore 28 additions, 1 deletioncms/templates/js/content-group-editor.underscore
Loading
Please register or sign in to comment