Merge branch 'master' into jmpm-analytics
Conflicts: lms/djangoapps/instructor/views.py lms/envs/common.py lms/templates/courseware/instructor_dashboard.html
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .pep8 2 additions, 0 deletions.pep8
- .ruby-version 1 addition, 0 deletions.ruby-version
- Gemfile 3 additions, 4 deletionsGemfile
- apt-packages.txt 1 addition, 0 deletionsapt-packages.txt
- cms/.coveragerc 2 additions, 2 deletionscms/.coveragerc
- cms/__init__.py 0 additions, 1 deletioncms/__init__.py
- cms/djangoapps/auth/authz.py 14 additions, 7 deletionscms/djangoapps/auth/authz.py
- cms/djangoapps/contentstore/__init__.py 0 additions, 2 deletionscms/djangoapps/contentstore/__init__.py
- cms/djangoapps/contentstore/course_info_model.py 27 additions, 22 deletionscms/djangoapps/contentstore/course_info_model.py
- cms/djangoapps/contentstore/features/advanced-settings.feature 51 additions, 0 deletions...jangoapps/contentstore/features/advanced-settings.feature
- cms/djangoapps/contentstore/features/advanced-settings.py 182 additions, 0 deletionscms/djangoapps/contentstore/features/advanced-settings.py
- cms/djangoapps/contentstore/features/common.py 88 additions, 21 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/courses.py 18 additions, 6 deletionscms/djangoapps/contentstore/features/courses.py
- cms/djangoapps/contentstore/features/factories.py 4 additions, 1 deletioncms/djangoapps/contentstore/features/factories.py
- cms/djangoapps/contentstore/features/section.feature 8 additions, 0 deletionscms/djangoapps/contentstore/features/section.feature
- cms/djangoapps/contentstore/features/section.py 56 additions, 15 deletionscms/djangoapps/contentstore/features/section.py
- cms/djangoapps/contentstore/features/signup.feature 3 additions, 3 deletionscms/djangoapps/contentstore/features/signup.feature
- cms/djangoapps/contentstore/features/signup.py 9 additions, 4 deletionscms/djangoapps/contentstore/features/signup.py
- cms/djangoapps/contentstore/features/studio-overview-togglesection.py 22 additions, 9 deletions...ps/contentstore/features/studio-overview-togglesection.py
Loading
Please register or sign in to comment