Merge branch 'master' into douglashall/fix_logistration_platform_name_display

common/lib/xmodule/xmodule/js/src/video/09_video_caption.js

@@ -759,7 +759,7 @@
                     self.subtitlesEl.find('.transcript-end')
                         .text(gettext('End of transcript. Skip to the start.'));
 
-                    self.container.find('.menu-container .control')
+                    self.container.find('.menu-container .language-menu')
                         .attr('aria-label', gettext('Language: Press the UP arrow key to enter the language menu then use UP and DOWN arrow keys to navigate language options. Press ENTER to change to the selected language.')); // jshint ignore:line
 
                     self.container.find('.menu-container .control .control-text')

common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee

@@ -337,8 +337,6 @@ if Backbone?
 
     fitName: (name) ->
       @maxNameWidth = @$(".forum-nav-browse").width() -
-        parseInt(@$(".forum-nav-browse").css("padding-left")) -
-        parseInt(@$(".forum-nav-browse").css("padding-right")) -
         @$(".forum-nav-browse .icon").outerWidth(true) -
         @$(".forum-nav-browse-drop-arrow").outerWidth(true)
       width = @getNameWidth(name)

docs/en_us/internal/testing.rst

@@ -341,16 +341,15 @@ To run JavaScript tests in a browser, run these commands.
 To debug these tests on devstack in a local browser:
 
  * first run the appropriate test_js_dev command from above which will open a browser using XQuartz
- * open the same URL in your browser but change the IP address to 192.168.33.10, e.g.
-    http://192.168.33.10:TEST_PORT/suite/cms
+ * open http://192.168.33.10:9876/debug.html in your host system's browser of choice
  * this will run all the tests and show you the results including details of any failures
  * you can click on an individually failing test and/or suite to re-run it by itself
  * you can now use the browser's developer tools to debug as you would any other JavaScript code
 
 Note: the port is also output to the console that you ran the tests from if you find that easier.
 
-These paver commands call through to a custom test runner. For more
-info, see `js-test-tool <https://github.com/edx/js-test-tool>`__.
+These paver commands call through to Karma. For more
+info, see `karma-runner.github.io <https://karma-runner.github.io/>`__.
 
 Running Bok Choy Acceptance Tests
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

requirements/edx/github.txt

@@ -90,7 +90,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.6#egg=xblock-lti-consumer==1.0.6
-git+https://github.com/edx/edx-proctoring.git@0.12.16#egg=edx-proctoring==0.12.16
+git+https://github.com/edx/edx-proctoring.git@0.12.17#egg=edx-proctoring==0.12.17
 
 # Third Party XBlocks
 -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga