Merge branch 'master' into feature/bk_forum_int
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt
Showing
- brew-formulas.txt 1 addition, 0 deletionsbrew-formulas.txt
- cms/static/sass/_base.scss 0 additions, 1 deletioncms/static/sass/_base.scss
- common/djangoapps/student/views.py 1 addition, 1 deletioncommon/djangoapps/student/views.py
- common/lib/capa/capa/xqueue_interface.py 3 additions, 0 deletionscommon/lib/capa/capa/xqueue_interface.py
- common/lib/xmodule/xmodule/course_module.py 36 additions, 5 deletionscommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/css/capa/display.scss 6 additions, 22 deletionscommon/lib/xmodule/xmodule/css/capa/display.scss
- common/lib/xmodule/xmodule/css/video/display.scss 5 additions, 4 deletionscommon/lib/xmodule/xmodule/css/video/display.scss
- common/lib/xmodule/xmodule/modulestore/__init__.py 9 additions, 1 deletioncommon/lib/xmodule/xmodule/modulestore/__init__.py
- common/lib/xmodule/xmodule/modulestore/mongo.py 7 additions, 0 deletionscommon/lib/xmodule/xmodule/modulestore/mongo.py
- common/lib/xmodule/xmodule/modulestore/xml.py 46 additions, 13 deletionscommon/lib/xmodule/xmodule/modulestore/xml.py
- common/lib/xmodule/xmodule/modulestore/xml_importer.py 17 additions, 16 deletionscommon/lib/xmodule/xmodule/modulestore/xml_importer.py
- common/lib/xmodule/xmodule/tests/__init__.py 1 addition, 0 deletionscommon/lib/xmodule/xmodule/tests/__init__.py
- common/lib/xmodule/xmodule/tests/test_export.py 7 additions, 5 deletionscommon/lib/xmodule/xmodule/tests/test_export.py
- common/lib/xmodule/xmodule/tests/test_import.py 45 additions, 0 deletionscommon/lib/xmodule/xmodule/tests/test_import.py
- common/test/data/two_toys/README 1 addition, 0 deletionscommon/test/data/two_toys/README
- common/test/data/two_toys/chapter/Overview.xml 4 additions, 0 deletionscommon/test/data/two_toys/chapter/Overview.xml
- common/test/data/two_toys/course.xml 1 addition, 0 deletionscommon/test/data/two_toys/course.xml
- common/test/data/two_toys/course/TT_2012_Fall.xml 3 additions, 0 deletionscommon/test/data/two_toys/course/TT_2012_Fall.xml
- common/test/data/two_toys/policies/TT_2012_Fall.json 23 additions, 0 deletionscommon/test/data/two_toys/policies/TT_2012_Fall.json
- common/test/data/two_toys/video/Video_Resources.xml 1 addition, 0 deletionscommon/test/data/two_toys/video/Video_Resources.xml
Loading
Please register or sign in to comment