Merge pull request #5461 from edx/release

Release

common/test/acceptance/tests/video/test_video_times.py

@@ -33,6 +33,7 @@ class VideoTimesTest(VideoBaseTest):
 
         self.assertGreaterEqual(int(self.video.position.split(':')[1]), 10)
 
+    @skip("Intermittently fails 1 Oct 2014")
     def test_video_end_time_with_default_start_time(self):
         """
         Scenario: End time works for Youtube video if starts playing from beginning.

lms/djangoapps/staticbook/views.py

@@ -106,7 +106,7 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
         viewer_params += current_chapter['url']
         current_url = current_chapter['url']
 
-    viewer_params += '#zoom=page-fit'
+    viewer_params += '#zoom=page-fit&disableRange=true'
     if page is not None:
         viewer_params += '&page={}'.format(page)
 

lms/templates/static_pdfbook.html

@@ -18,7 +18,7 @@ $(function(){
     e.preventDefault();
     var url = $(this).attr('rel');
     $('#viewer-frame').attr({
-        'src': '${request.path}?viewer=true&file=' + url + '#zoom=page-fit',
+        'src': '${request.path}?viewer=true&file=' + url + '#zoom=page-fit&disableRange=true',
         'title': $(this).text()
         });
     $('#viewer-frame').focus();