Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into...
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
No related branches found
No related tags found
Showing
- cms/djangoapps/contentstore/views.py 3 additions, 3 deletionscms/djangoapps/contentstore/views.py
- cms/static/coffee/src/models/module.coffee 3 additions, 3 deletionscms/static/coffee/src/models/module.coffee
- cms/static/coffee/src/views/unit.coffee 8 additions, 30 deletionscms/static/coffee/src/views/unit.coffee
- cms/static/js/base.js 29 additions, 16 deletionscms/static/js/base.js
- cms/static/sass/_subsection.scss 26 additions, 1 deletioncms/static/sass/_subsection.scss
- cms/static/sass/_unit.scss 12 additions, 10 deletionscms/static/sass/_unit.scss
- cms/templates/edit_subsection.html 4 additions, 3 deletionscms/templates/edit_subsection.html
- cms/templates/manage_users.html 2 additions, 2 deletionscms/templates/manage_users.html
- cms/templates/unit.html 5 additions, 6 deletionscms/templates/unit.html
- common/lib/xmodule/xmodule/abtest_module.py 1 addition, 1 deletioncommon/lib/xmodule/xmodule/abtest_module.py
- common/lib/xmodule/xmodule/course_module.py 1 addition, 1 deletioncommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/template_module.py 1 addition, 0 deletionscommon/lib/xmodule/xmodule/template_module.py
- common/lib/xmodule/xmodule/templates.py 7 additions, 3 deletionscommon/lib/xmodule/xmodule/templates.py
- common/lib/xmodule/xmodule/templates/course/empty.yaml 1 addition, 0 deletionscommon/lib/xmodule/xmodule/templates/course/empty.yaml
Loading
Please register or sign in to comment