Merge branch 'release/0.26.0'

Author: felliott

.gitignore

@@ -12,18 +12,21 @@ Thumbs.db
 *~
 
 # R
-#######################
+######################
 .Rhistory
 
 # Python
-#######################
+######################
 *.py[cod]
 **/*.pyc
+.mypy_cache
 
 # C extensions
+######################
 *.so
 
 # Packages
+######################
 *.egg
 *.egg-info
 dist
@@ -45,30 +48,45 @@ __pycache__
 .env
 
 # Installer logs
+######################
 pip-log.txt
 
 # Unit test / coverage reports
+######################
 .coverage
 .tox
 nosetests.xml
 
 # Translations
+######################
 *.mo
 
 # Mr Developer
+######################
 .mr.developer.cfg
 .project
 .pydevproject
 
 # Sphinx
+######################
 docs/_build
 README.html
 
 # Player files
+######################
 player/files/*
 player/mfr_config_local.py
 player/static/mfr/*
 
+# Misc
+######################
 !.gitkeep
-
 .cache
+
+# Node Modules
+######################
+node_modules/
+
+# Asynchronous HTTP
+######################
+/src/

AUTHORS.rst

@@ -31,5 +31,6 @@ Contributors
 - Matthew Keitelman `@zamattiac <https://github.com/zamattiac>`_
 - John Tordoff `@Johnetordoff <https://github.com/Johnetordoff>`_
 - Addison Schiller `@AddisonSchiller <https://github.com/AddisonSchiller>`_
-- Longze Chen `@cslzchen https://github.com/cslzchen`_
-- Jonathon Love `@jonathon-love https://github.com/jonathon-love`_
+- Longze Chen `@cslzchen <https://github.com/cslzchen>`_
+- Jonathon Love `@jonathon-love <https://github.com/jonathon-love>`_
+- Josh Bird `@birdbrained <https://github.com/birdbrained>`_

CHANGELOG

@@ -2,6 +2,17 @@
 ChangeLog
 *********
 
+0.26.0 (2018-06-22)
+===================
+- Feature: Teach MFR to identify itself when requesting metadata from WaterButler. This will allow
+WaterButler to signal to the OSF when a render or export request occurs, letting OSF tally better
+metrics on file views.
+- Feature: When asked to export a file in its current format, return the unmodified file instead of
+complaining about the extension not having a supported exporter.
+- Fix: Don't show scrollbars on videos. They should be entirely visible without scrolling.
+- Fix: Render .tif files when extension is capitalized.
+- Docs: Remove obsolete documentation, fix markup errors, and edit existing docs.
+
 0.25.11 (2018-06-08)
 ====================
 - Fix: Percent-encode quote characters in urls to avoid breaking some renderers.