Merge branch 'master' into ormsbee/verifyuser3
Conflicts: lms/envs/common.py
No related branches found
Showing
- cms/djangoapps/contentstore/features/static-pages.py 14 additions, 7 deletionscms/djangoapps/contentstore/features/static-pages.py
- cms/djangoapps/contentstore/features/upload.feature 10 additions, 0 deletionscms/djangoapps/contentstore/features/upload.feature
- cms/djangoapps/contentstore/features/upload.py 18 additions, 1 deletioncms/djangoapps/contentstore/features/upload.py
- cms/djangoapps/contentstore/features/video-editor.feature 2 additions, 2 deletionscms/djangoapps/contentstore/features/video-editor.feature
- cms/djangoapps/contentstore/features/video-editor.py 7 additions, 6 deletionscms/djangoapps/contentstore/features/video-editor.py
- cms/djangoapps/contentstore/features/video.feature 3 additions, 3 deletionscms/djangoapps/contentstore/features/video.feature
- cms/djangoapps/contentstore/features/video.py 20 additions, 1 deletioncms/djangoapps/contentstore/features/video.py
- cms/djangoapps/contentstore/management/commands/check_course.py 0 additions, 1 deletion...angoapps/contentstore/management/commands/check_course.py
- cms/djangoapps/contentstore/module_info_model.py 3 additions, 3 deletionscms/djangoapps/contentstore/module_info_model.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 63 additions, 25 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 18 additions, 10 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/tests/test_crud.py 6 additions, 10 deletionscms/djangoapps/contentstore/tests/test_crud.py
- cms/djangoapps/contentstore/tests/test_import_nostatic.py 3 additions, 3 deletionscms/djangoapps/contentstore/tests/test_import_nostatic.py
- cms/djangoapps/contentstore/tests/test_item.py 6 additions, 6 deletionscms/djangoapps/contentstore/tests/test_item.py
- cms/djangoapps/contentstore/views/assets.py 2 additions, 2 deletionscms/djangoapps/contentstore/views/assets.py
- cms/djangoapps/contentstore/views/component.py 47 additions, 24 deletionscms/djangoapps/contentstore/views/component.py
- cms/djangoapps/contentstore/views/course.py 46 additions, 39 deletionscms/djangoapps/contentstore/views/course.py
- cms/djangoapps/contentstore/views/item.py 2 additions, 12 deletionscms/djangoapps/contentstore/views/item.py
- cms/djangoapps/contentstore/views/preview.py 8 additions, 10 deletionscms/djangoapps/contentstore/views/preview.py
- cms/djangoapps/contentstore/views/session_kv_store.py 9 additions, 16 deletionscms/djangoapps/contentstore/views/session_kv_store.py
Loading
Please register or sign in to comment