merged master branch into feature/abarrett/lms-notes-app. resolved conflicts...
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- .pylintrc 22 additions, 3 deletions.pylintrc
- .ruby-gemset 1 addition, 0 deletions.ruby-gemset
- apt-packages.txt 0 additions, 1 deletionapt-packages.txt
- cms/djangoapps/auth/authz.py 1 addition, 4 deletionscms/djangoapps/auth/authz.py
- cms/djangoapps/contentstore/course_info_model.py 1 addition, 2 deletionscms/djangoapps/contentstore/course_info_model.py
- cms/djangoapps/contentstore/features/advanced-settings.feature 6 additions, 3 deletions...jangoapps/contentstore/features/advanced-settings.feature
- cms/djangoapps/contentstore/features/advanced-settings.py 23 additions, 35 deletionscms/djangoapps/contentstore/features/advanced-settings.py
- cms/djangoapps/contentstore/features/checklists.feature 4 additions, 1 deletioncms/djangoapps/contentstore/features/checklists.feature
- cms/djangoapps/contentstore/features/checklists.py 19 additions, 15 deletionscms/djangoapps/contentstore/features/checklists.py
- cms/djangoapps/contentstore/features/common.py 41 additions, 94 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/course-settings.feature 28 additions, 0 deletionscms/djangoapps/contentstore/features/course-settings.feature
- cms/djangoapps/contentstore/features/course-settings.py 165 additions, 0 deletionscms/djangoapps/contentstore/features/course-settings.py
- cms/djangoapps/contentstore/features/courses.feature 1 addition, 1 deletioncms/djangoapps/contentstore/features/courses.feature
- cms/djangoapps/contentstore/features/courses.py 11 additions, 8 deletionscms/djangoapps/contentstore/features/courses.py
- cms/djangoapps/contentstore/features/section.feature 1 addition, 0 deletionscms/djangoapps/contentstore/features/section.feature
- cms/djangoapps/contentstore/features/section.py 17 additions, 24 deletionscms/djangoapps/contentstore/features/section.py
- cms/djangoapps/contentstore/features/signup.py 5 additions, 1 deletioncms/djangoapps/contentstore/features/signup.py
- cms/djangoapps/contentstore/features/studio-overview-togglesection.feature 17 additions, 16 deletions...ntentstore/features/studio-overview-togglesection.feature
- cms/djangoapps/contentstore/features/studio-overview-togglesection.py 18 additions, 15 deletions...ps/contentstore/features/studio-overview-togglesection.py
Loading
Please register or sign in to comment