Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .pylintrc 13 additions, 5 deletions.pylintrc
- .ruby-version 1 addition, 1 deletion.ruby-version
- cms/djangoapps/contentstore/course_info_model.py 20 additions, 21 deletionscms/djangoapps/contentstore/course_info_model.py
- cms/djangoapps/contentstore/features/advanced-settings.feature 17 additions, 29 deletions...jangoapps/contentstore/features/advanced-settings.feature
- cms/djangoapps/contentstore/features/advanced-settings.py 68 additions, 119 deletionscms/djangoapps/contentstore/features/advanced-settings.py
- cms/djangoapps/contentstore/management/commands/delete_course.py 1 addition, 1 deletion...ngoapps/contentstore/management/commands/delete_course.py
- cms/djangoapps/contentstore/module_info_model.py 14 additions, 13 deletionscms/djangoapps/contentstore/module_info_model.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 118 additions, 94 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 21 additions, 20 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/tests/test_course_updates.py 1 addition, 1 deletioncms/djangoapps/contentstore/tests/test_course_updates.py
- cms/djangoapps/contentstore/tests/test_utils.py 1 addition, 1 deletioncms/djangoapps/contentstore/tests/test_utils.py
- cms/djangoapps/contentstore/tests/tests.py 2 additions, 2 deletionscms/djangoapps/contentstore/tests/tests.py
- cms/djangoapps/contentstore/utils.py 3 additions, 3 deletionscms/djangoapps/contentstore/utils.py
- cms/djangoapps/contentstore/views.py 121 additions, 93 deletionscms/djangoapps/contentstore/views.py
- cms/djangoapps/models/settings/course_details.py 8 additions, 8 deletionscms/djangoapps/models/settings/course_details.py
- cms/djangoapps/models/settings/course_grading.py 40 additions, 21 deletionscms/djangoapps/models/settings/course_grading.py
- cms/djangoapps/models/settings/course_metadata.py 37 additions, 26 deletionscms/djangoapps/models/settings/course_metadata.py
- cms/envs/dev.py 7 additions, 0 deletionscms/envs/dev.py
- cms/envs/test.py 7 additions, 0 deletionscms/envs/test.py
Loading
Please register or sign in to comment