Merge branch 'master' into move_settings
Conflicts: djangoapps/student/views.py urls.py
No related branches found
No related tags found
Showing
- .DS_Store 0 additions, 0 deletions.DS_Store
- .gitignore 2 additions, 0 deletions.gitignore
- ci/build.sh 0 additions, 29 deletionsci/build.sh
- djangoapps/courseware/capa/calc.py 6 additions, 2 deletionsdjangoapps/courseware/capa/calc.py
- djangoapps/courseware/capa/inputtypes.py 2 additions, 1 deletiondjangoapps/courseware/capa/inputtypes.py
- djangoapps/courseware/capa/responsetypes.py 9 additions, 6 deletionsdjangoapps/courseware/capa/responsetypes.py
- djangoapps/courseware/grades.py 73 additions, 39 deletionsdjangoapps/courseware/grades.py
- djangoapps/courseware/modules/capa_module.py 8 additions, 1 deletiondjangoapps/courseware/modules/capa_module.py
- djangoapps/courseware/tests.py 3 additions, 1 deletiondjangoapps/courseware/tests.py
- djangoapps/student/migrations/0005_name_change.py 146 additions, 0 deletionsdjangoapps/student/migrations/0005_name_change.py
- djangoapps/student/models.py 44 additions, 2 deletionsdjangoapps/student/models.py
- djangoapps/student/views.py 221 additions, 17 deletionsdjangoapps/student/views.py
- lib/mitxmako/middleware.py 4 additions, 2 deletionslib/mitxmako/middleware.py
- lib/mitxmako/shortcuts.py 7 additions, 4 deletionslib/mitxmako/shortcuts.py
- pre-requirements.txt 1 addition, 0 deletionspre-requirements.txt
- rakefile 78 additions, 0 deletionsrakefile
- requirements.txt 14 additions, 0 deletionsrequirements.txt
- settings.py 13 additions, 2 deletionssettings.py
- static/css/application.css 214 additions, 79 deletionsstatic/css/application.css
- static/css/marketing.css 19 additions, 1 deletionstatic/css/marketing.css
Loading
Please register or sign in to comment