Merge branch 'release' into release-merge-test
Conflicts: lms/djangoapps/commerce/urls.py lms/djangoapps/commerce/views.py
No related branches found
Showing
- cms/djangoapps/contentstore/management/commands/export_convert_format.py 3 additions, 2 deletions...contentstore/management/commands/export_convert_format.py
- cms/djangoapps/contentstore/management/commands/tests/test_export_convert_format.py 4 additions, 3 deletions...e/management/commands/tests/test_export_convert_format.py
- cms/djangoapps/contentstore/views/tests/test_import_export.py 30 additions, 5 deletions...djangoapps/contentstore/views/tests/test_import_export.py
- cms/envs/bok_choy.py 1 addition, 0 deletionscms/envs/bok_choy.py
- cms/envs/test.py 1 addition, 0 deletionscms/envs/test.py
- common/djangoapps/course_modes/tests/test_views.py 16 additions, 0 deletionscommon/djangoapps/course_modes/tests/test_views.py
- common/djangoapps/course_modes/views.py 2 additions, 1 deletioncommon/djangoapps/course_modes/views.py
- common/djangoapps/student/tests/tests.py 13 additions, 0 deletionscommon/djangoapps/student/tests/tests.py
- common/djangoapps/student/views.py 1 addition, 0 deletionscommon/djangoapps/student/views.py
- common/lib/xmodule/xmodule/x_module.py 6 additions, 0 deletionscommon/lib/xmodule/xmodule/x_module.py
- common/static/js/utils/rwd_header.js 0 additions, 94 deletionscommon/static/js/utils/rwd_header.js
- common/test/acceptance/pages/lms/dashboard.py 0 additions, 14 deletionscommon/test/acceptance/pages/lms/dashboard.py
- common/test/acceptance/tests/lms/test_lms.py 0 additions, 6 deletionscommon/test/acceptance/tests/lms/test_lms.py
- lms/djangoapps/commerce/tests/test_views.py 11 additions, 0 deletionslms/djangoapps/commerce/tests/test_views.py
- lms/djangoapps/commerce/views.py 2 additions, 1 deletionlms/djangoapps/commerce/views.py
- lms/djangoapps/courseware/tests/test_module_render.py 23 additions, 2 deletionslms/djangoapps/courseware/tests/test_module_render.py
- lms/djangoapps/verify_student/tests/test_views.py 11 additions, 0 deletionslms/djangoapps/verify_student/tests/test_views.py
- lms/djangoapps/verify_student/views.py 1 addition, 0 deletionslms/djangoapps/verify_student/views.py
- lms/envs/aws.py 5 additions, 0 deletionslms/envs/aws.py
- lms/envs/common.py 0 additions, 6 deletionslms/envs/common.py
Loading
Please register or sign in to comment