Merge pull request #284 from edx/peter-fogg/fix-default-videos
Peter fogg/fix default videos
Showing
- CHANGELOG.rst 9 additions, 0 deletionsCHANGELOG.rst
- cms/djangoapps/auth/authz.py 83 additions, 14 deletionscms/djangoapps/auth/authz.py
- cms/djangoapps/auth/tests/test_authz.py 176 additions, 0 deletionscms/djangoapps/auth/tests/test_authz.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 85 additions, 34 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/views/course.py 2 additions, 2 deletionscms/djangoapps/contentstore/views/course.py
- cms/envs/acceptance.py 15 additions, 0 deletionscms/envs/acceptance.py
- cms/envs/test.py 1 addition, 1 deletioncms/envs/test.py
- cms/static/coffee/spec/views/feedback_spec.coffee 39 additions, 0 deletionscms/static/coffee/spec/views/feedback_spec.coffee
- cms/static/js/views/feedback.js 12 additions, 2 deletionscms/static/js/views/feedback.js
- cms/templates/emails/activation_email_subject.txt 1 addition, 1 deletioncms/templates/emails/activation_email_subject.txt
- common/djangoapps/student/forms.py 21 additions, 0 deletionscommon/djangoapps/student/forms.py
- common/djangoapps/student/tests/tests.py 112 additions, 3 deletionscommon/djangoapps/student/tests/tests.py
- common/djangoapps/student/views.py 20 additions, 13 deletionscommon/djangoapps/student/views.py
- common/lib/capa/capa/capa_problem.py 4 additions, 4 deletionscommon/lib/capa/capa/capa_problem.py
- common/lib/capa/capa/inputtypes.py 11 additions, 11 deletionscommon/lib/capa/capa/inputtypes.py
- common/lib/capa/capa/safe_exec/safe_exec.py 0 additions, 1 deletioncommon/lib/capa/capa/safe_exec/safe_exec.py
- common/lib/capa/capa/tests/test_inputtypes.py 4 additions, 4 deletionscommon/lib/capa/capa/tests/test_inputtypes.py
- common/lib/capa/capa/tests/test_responsetypes.py 18 additions, 0 deletionscommon/lib/capa/capa/tests/test_responsetypes.py
- common/lib/xmodule/xmodule/capa_module.py 38 additions, 35 deletionscommon/lib/xmodule/xmodule/capa_module.py
- common/lib/xmodule/xmodule/combined_open_ended_module.py 2 additions, 3 deletionscommon/lib/xmodule/xmodule/combined_open_ended_module.py
Loading
Please register or sign in to comment