Merge conflicts
Showing
- CHANGELOG.rst 5 additions, 2 deletionsCHANGELOG.rst
- cms/djangoapps/contentstore/features/video.feature 23 additions, 20 deletionscms/djangoapps/contentstore/features/video.feature
- cms/djangoapps/contentstore/tests/test_contentstore.py 1 addition, 9 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 79 additions, 14 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/views/course.py 110 additions, 118 deletionscms/djangoapps/contentstore/views/course.py
- cms/djangoapps/models/settings/course_details.py 5 additions, 5 deletionscms/djangoapps/models/settings/course_details.py
- cms/djangoapps/models/settings/course_grading.py 6 additions, 6 deletionscms/djangoapps/models/settings/course_grading.py
- cms/djangoapps/models/settings/course_metadata.py 17 additions, 44 deletionscms/djangoapps/models/settings/course_metadata.py
- cms/static/sass/contexts/_ie.scss 4 additions, 0 deletionscms/static/sass/contexts/_ie.scss
- cms/static/sass/elements/_xmodules.scss 12 additions, 1 deletioncms/static/sass/elements/_xmodules.scss
- cms/templates/settings.html 2 additions, 3 deletionscms/templates/settings.html
- cms/templates/settings_advanced.html 5 additions, 5 deletionscms/templates/settings_advanced.html
- cms/templates/settings_graders.html 4 additions, 4 deletionscms/templates/settings_graders.html
- cms/templates/unit.html 1 addition, 1 deletioncms/templates/unit.html
- cms/templates/widgets/header.html 2 additions, 1 deletioncms/templates/widgets/header.html
- cms/templates/widgets/problem-edit.html 1 addition, 1 deletioncms/templates/widgets/problem-edit.html
- cms/urls.py 1 addition, 7 deletionscms/urls.py
- common/djangoapps/external_auth/views.py 1 addition, 140 deletionscommon/djangoapps/external_auth/views.py
- common/djangoapps/student/management/commands/pearson_dump.py 0 additions, 77 deletions...on/djangoapps/student/management/commands/pearson_dump.py
- common/djangoapps/student/management/commands/pearson_export_cdd.py 0 additions, 111 deletions...ngoapps/student/management/commands/pearson_export_cdd.py
Loading
Please register or sign in to comment