Merge branch 'dogfood' of github.com:MITx/mitx into dogfood
Conflicts: templates/mathjax_include.html
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 2 additions, 2 deletionsGemfile.lock
- brew-formulas.txt 8 additions, 0 deletionsbrew-formulas.txt
- create-dev-env.sh 273 additions, 0 deletionscreate-dev-env.sh
- djangoapps/courseware/capa/capa_problem.py 1 addition, 1 deletiondjangoapps/courseware/capa/capa_problem.py
- djangoapps/courseware/capa/inputtypes.py 1 addition, 1 deletiondjangoapps/courseware/capa/inputtypes.py
- djangoapps/courseware/capa/responsetypes.py 30 additions, 54 deletionsdjangoapps/courseware/capa/responsetypes.py
- djangoapps/courseware/content_parser.py 2 additions, 1 deletiondjangoapps/courseware/content_parser.py
- djangoapps/courseware/grades.py 1 addition, 1 deletiondjangoapps/courseware/grades.py
- djangoapps/courseware/management/commands/check_course.py 1 addition, 1 deletiondjangoapps/courseware/management/commands/check_course.py
- djangoapps/courseware/module_render.py 103 additions, 56 deletionsdjangoapps/courseware/module_render.py
- djangoapps/courseware/modules/capa_module.py 8 additions, 11 deletionsdjangoapps/courseware/modules/capa_module.py
- djangoapps/courseware/modules/html_module.py 3 additions, 1 deletiondjangoapps/courseware/modules/html_module.py
- djangoapps/courseware/modules/schematic_module.py 4 additions, 1 deletiondjangoapps/courseware/modules/schematic_module.py
- djangoapps/courseware/modules/seq_module.py 22 additions, 43 deletionsdjangoapps/courseware/modules/seq_module.py
- djangoapps/courseware/modules/template_module.py 4 additions, 1 deletiondjangoapps/courseware/modules/template_module.py
- djangoapps/courseware/modules/vertical_module.py 5 additions, 11 deletionsdjangoapps/courseware/modules/vertical_module.py
- djangoapps/courseware/modules/video_module.py 10 additions, 24 deletionsdjangoapps/courseware/modules/video_module.py
- djangoapps/courseware/modules/x_module.py 89 additions, 27 deletionsdjangoapps/courseware/modules/x_module.py
Loading
Please register or sign in to comment