Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts: .gitmodules lms/envs/aws.py lms/envs/common.py lms/static/sass/course.scss lms/urls.py
Showing
- .gitignore 0 additions, 2 deletions.gitignore
- .hgignore 0 additions, 12 deletions.hgignore
- common/djangoapps/student/migrations/0021_remove_askbot.py 157 additions, 0 deletionscommon/djangoapps/student/migrations/0021_remove_askbot.py
- common/djangoapps/student/models.py 2 additions, 0 deletionscommon/djangoapps/student/models.py
- common/djangoapps/student/views.py 14 additions, 0 deletionscommon/djangoapps/student/views.py
- common/lib/xmodule/xmodule/x_module.py 1 addition, 1 deletioncommon/lib/xmodule/xmodule/x_module.py
- common/test/data/full/problem/choiceresponse_demo.xml 37 additions, 0 deletionscommon/test/data/full/problem/choiceresponse_demo.xml
- common/test/data/full/problem/codeinput_demo.xml 205 additions, 0 deletionscommon/test/data/full/problem/codeinput_demo.xml
- common/test/data/full/problem/multiplechoicelresponse_demo.xml 17 additions, 0 deletions...n/test/data/full/problem/multiplechoicelresponse_demo.xml
- common/test/data/full/problem/numericalresponse_demo.xml 31 additions, 0 deletionscommon/test/data/full/problem/numericalresponse_demo.xml
- common/test/data/full/problem/test_files/chemicalformularesponse.xml 64 additions, 0 deletions.../data/full/problem/test_files/chemicalformularesponse.xml
- common/test/data/full/problem/test_files/choiceresponse_checkbox.xml 59 additions, 0 deletions.../data/full/problem/test_files/choiceresponse_checkbox.xml
- common/test/data/full/problem/test_files/choiceresponse_radio.xml 40 additions, 0 deletions...est/data/full/problem/test_files/choiceresponse_radio.xml
- common/test/data/full/problem/test_files/coderesponse.xml 33 additions, 0 deletionscommon/test/data/full/problem/test_files/coderesponse.xml
- common/test/data/full/problem/test_files/coderesponse_externalresponseformat.xml 101 additions, 0 deletions...roblem/test_files/coderesponse_externalresponseformat.xml
- common/test/data/full/problem/test_files/formularesponse_with_hint.xml 45 additions, 0 deletions...ata/full/problem/test_files/formularesponse_with_hint.xml
- common/test/data/full/problem/test_files/imageresponse.xml 21 additions, 0 deletionscommon/test/data/full/problem/test_files/imageresponse.xml
- common/test/data/full/problem/test_files/javascriptresponse.xml 13 additions, 0 deletions.../test/data/full/problem/test_files/javascriptresponse.xml
- common/test/data/full/problem/test_files/multi_bare.xml 21 additions, 0 deletionscommon/test/data/full/problem/test_files/multi_bare.xml
- common/test/data/full/problem/test_files/multichoice.xml 21 additions, 0 deletionscommon/test/data/full/problem/test_files/multichoice.xml
Loading
Please register or sign in to comment