From e439c4441905547853d57764343bca32ef126ec8 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Mon, 8 Aug 2016 10:13:54 -0400 Subject: [PATCH 1/2] Update proctoring version for testing purposes. --- lms/static/sass/course/courseware/_courseware.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index d47c851e6a..73af1edb3b 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -205,7 +205,7 @@ html.video-fullscreen { } } - background-color: #F2F4F5; + background-color: #F2F8FB; padding: 30px; font-size: 16px; box-shadow: inset 1px 1px 2px rgba(0, 0, 0, .1); @@ -283,7 +283,7 @@ html.video-fullscreen { display: block; } p { - color: rgb(63, 58, 59); + color: #414141; strong { font-weight: 600; } From 4772c61deed5778f23d0644362b3a491fd7efcfe Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Fri, 29 Jul 2016 13:19:49 -0400 Subject: [PATCH 2/2] Update to use new edx-proctoring version --- lms/djangoapps/courseware/tests/test_module_render.py | 2 +- requirements/edx/github.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index 40a0c6abf1..3ec81a2844 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -929,7 +929,7 @@ class TestProctoringRendering(SharedModuleStoreTestCase): CourseMode.VERIFIED, False, 'error', - 'There was a problem with your proctoring session', + 'A technical error has occurred with your proctored exam', False ), ) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 9978700e08..6bef6a694c 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -92,7 +92,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.2#egg=xblock-utils==1.0.2 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1 git+https://github.com/edx/xblock-lti-consumer.git@v1.0.9#egg=xblock-lti-consumer==1.0.9 -git+https://github.com/edx/edx-proctoring.git@0.12.21#egg=edx-proctoring==0.12.21 +git+https://github.com/edx/edx-proctoring.git@0.13.0#egg=edx-proctoring==0.13.0 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga