Merge branch 'release/0.21.0'

Author: felliott

CHANGELOG

@@ -2,6 +2,12 @@
 ChangeLog
 *********
 
+0.21.0 (2017-04-07)
+===================
+- Feature: Turn on scrolling for the MFR iframe to support wide JASP files.
+- Fix: Fix rendering of Google Drawing (.gdraw) files by directing them to the image renderer
+rather than the unoconv renderer.
+
 0.20.1 (2017-03-02)
 ===================
 - Fix: Cast OSF file size metadata to an int before comparing to our maximum supported file size

mfr/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.20.1'
+__version__ = '0.21.0'
 __import__('pkg_resources').declare_namespace(__name__)

mfr/server/static/js/mfr.js

@@ -79,6 +79,7 @@
             self.pymParent = new pym.Parent(self.id, self.url, self.config);
             self.pymParent.iframe.setAttribute('allowfullscreen', '');
             self.pymParent.iframe.setAttribute('webkitallowfullscreen', '');
+            self.pymParent.iframe.setAttribute('scrolling', 'yes');
 
             self.pymParent.el.appendChild(self.spinner);
             $(self.pymParent.iframe).load(function () {

setup.py

@@ -42,7 +42,7 @@ def parse_requirements(requirements):
         ],
         'mfr.exporters': [
             # google docs
-            '.gdraw = mfr.extensions.unoconv:UnoconvExporter',
+            '.gdraw = mfr.extensions.image:ImageExporter',
             '.gdoc = mfr.extensions.unoconv:UnoconvExporter',
             '.gsheet = mfr.extensions.unoconv:UnoconvExporter',
             '.gslides = mfr.extensions.unoconv:UnoconvExporter',