Resolve conflicts merging master to rc/2013-11-21
Showing
- .gitignore 5 additions, 0 deletions.gitignore
- AUTHORS 1 addition, 0 deletionsAUTHORS
- CHANGELOG.rst 37 additions, 6 deletionsCHANGELOG.rst
- cms/djangoapps/contentstore/features/component_settings_editor_helpers.py 5 additions, 10 deletions...ontentstore/features/component_settings_editor_helpers.py
- cms/djangoapps/contentstore/features/course-updates.feature 14 additions, 0 deletionscms/djangoapps/contentstore/features/course-updates.feature
- cms/djangoapps/contentstore/features/course-updates.py 29 additions, 0 deletionscms/djangoapps/contentstore/features/course-updates.py
- cms/djangoapps/contentstore/features/static-pages.feature 12 additions, 7 deletionscms/djangoapps/contentstore/features/static-pages.feature
- cms/djangoapps/contentstore/features/static-pages.py 44 additions, 0 deletionscms/djangoapps/contentstore/features/static-pages.py
- cms/djangoapps/contentstore/features/transcripts.feature 1 addition, 0 deletionscms/djangoapps/contentstore/features/transcripts.feature
- cms/djangoapps/contentstore/features/transcripts.py 1 addition, 0 deletionscms/djangoapps/contentstore/features/transcripts.py
- cms/djangoapps/contentstore/features/video.feature 23 additions, 20 deletionscms/djangoapps/contentstore/features/video.feature
- cms/djangoapps/contentstore/features/video.py 1 addition, 1 deletioncms/djangoapps/contentstore/features/video.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 195 additions, 108 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/tests/test_course_index.py 1 addition, 3 deletionscms/djangoapps/contentstore/tests/test_course_index.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 262 additions, 124 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/tests/test_import_export.py 1 addition, 1 deletioncms/djangoapps/contentstore/tests/test_import_export.py
- cms/djangoapps/contentstore/tests/test_item.py 104 additions, 1 deletioncms/djangoapps/contentstore/tests/test_item.py
- cms/djangoapps/contentstore/tests/test_transcripts.py 10 additions, 4 deletionscms/djangoapps/contentstore/tests/test_transcripts.py
- cms/djangoapps/contentstore/tests/utils.py 19 additions, 1 deletioncms/djangoapps/contentstore/tests/utils.py
- cms/djangoapps/contentstore/views/checklist.py 7 additions, 15 deletionscms/djangoapps/contentstore/views/checklist.py
Loading
Please register or sign in to comment