Merge branch 'release/20.0.0'

felliott · felliott · commit 552370704629 · 2020-07-01T15:15:34.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,13 @@
 ChangeLog
 *********
 
+20.0.0 (2020-07-01)
+===================
+- Happy Canada Day, everyone!
+- Feature: Stop preloading videos in MFR to save bandwidth/memory.  Instead display a static poster
+with the COS logo. (thanks ro @allsey87 for the suggestion and thanks to @Johnetordoff for the
+alley-oop!)
+
 19.1.0 (2019-09-25)
 ===================
 - Feature: Update MFR's Dockerfile to be based off of Debian Buster and install LibreOffice via
diff --git a/mfr/extensions/video/templates/viewer.mako b/mfr/extensions/video/templates/viewer.mako
@@ -6,7 +6,7 @@
     }
 </style>
 
-<video controls height="100%">
+<video controls poster="/static/images/vid-thumbnail.png" preload="none" height="100%">
   <source src="${url}">
   Your browser does not support the video tag.
 </video>
diff --git a/mfr/server/static/images/vid-thumbnail.png b/mfr/server/static/images/vid-thumbnail.png
diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '19.1.0'
+__version__ = '20.0.0'
diff --git a/requirements.txt b/requirements.txt
@@ -45,7 +45,7 @@ reportlab==3.4.0
 docutils==0.12
 
 # Tabular
-pandas==0.17.1
+pandas==0.25.1
 xlrd==1.0.0
 h5py==2.7.0
 scipy==0.19.1

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`}`
`7`	`7`	`</style>`
`8`	`8`
`9`		`-<video controls height="100%">`
	`9`	`+<video controls poster="/static/images/vid-thumbnail.png" preload="none" height="100%">`
`10`	`10`	`<source src="${url}">`
`11`	`11`	`Your browser does not support the video tag.`
`12`	`12`	`</video>`