Merge remote-tracking branch 'origin/master' into test

HISTORY.rst

@@ -7,6 +7,14 @@
 - Fix height calculation in resize transformation
 - Improve upgrade instructions
 
+2.1.5 (2016-xx-xx)
+==================
+- Backport resize transformation math operation fix (GitLab #319).
+- Update Pillow to 3.1.2 (Security fix).
+- Backport zoom transformation performance improvement (GitLab #334).
+- Backport trash can navigation link resolution fix (GitLab #331).
+- Improve documentation regarding the use of GPG version 1 (GitLab #333).
+
 2.1.4 (2016-10-28)
 ==================
 - Add missing link to the 2.1.3 release notes in the index file.

docs/index.rst

@@ -10,7 +10,9 @@ and install it from PyPI with the following commands:
 
 .. code-block:: bash
 
-    $ sudo apt-get install libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv tesseract-ocr poppler-utils -y
+    $ sudo apt-get install libjpeg-dev libmagic1 libpng-dev \
+    libreoffice libtiff-dev gcc ghostscript gnupg python-dev \
+    python-virtualenv tesseract-ocr poppler-utils -y
     $ virtualenv venv
     $ source venv/bin/activate
     (venv) pip install mayan-edms

docs/releases/2.1.5.rst

@@ -0,0 +1,83 @@
+===============================
+Mayan EDMS v2.1.5 release notes
+===============================
+
+Released: XX, 2016
+
+What's new
+==========
+
+This is a bug-fix release and all users are encouraged to upgrade.
+
+Other changes
+-------------
+
+- Backport resize transformation math operation fix (GitLab #319).
+- Update Pillow to 3.1.2
+
+    - https://pillow.readthedocs.io/en/3.4.x/releasenotes/3.1.1.html
+    - https://pillow.readthedocs.io/en/3.4.x/releasenotes/3.1.2.html
+
+- Backport zoom performance improvement (GitLab #334).
+- Backport trash can navigation link resolution fix (GitLab #331).
+- Improve documentation regarding the use of GPG version 1 (GitLab #333).
+
+Removals
+--------
+* None
+
+Upgrading from a previous version
+---------------------------------
+
+Using PIP
+~~~~~~~~~
+
+Type in the console::
+
+    $ pip install -U mayan-edms
+
+the requirements will also be updated automatically.
+
+Using Git
+~~~~~~~~~
+
+If you installed Mayan EDMS by cloning the Git repository issue the commands::
+
+    $ git reset --hard HEAD
+    $ git pull
+
+otherwise download the compressed archived and uncompress it overriding the
+existing installation.
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+Common steps
+~~~~~~~~~~~~
+
+Migrate existing database schema with::
+
+    $ mayan-edms.py performupgrade
+
+Add new static media::
+
+    $ mayan-edms.py collectstatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+=============================
+
+* None
+
+Bugs fixed or issues closed
+===========================
+
+* `GitLab issue #319 <https://gitlab.com/mayan-edms/mayan-edms/issues/319>`_ TransformationResize issue with very "long" image
+* `GitLab issue #331 <https://gitlab.com/mayan-edms/mayan-edms/issues/331>`_ Trash List View: Items actions should be limited
+* `GitLab issue #333 <https://gitlab.com/mayan-edms/mayan-edms/issues/333>`_ "Unable to run gpg - it may not be available."
+* `GitLab issue #334 <https://gitlab.com/mayan-edms/mayan-edms/issues/334>`_ Perfomance improvment: prevent unnecessary image.resize in TransformationZoom
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/index.rst

@@ -23,6 +23,7 @@ versions of the documentation contain the release notes for any later releases.
    :maxdepth: 1
 
    2.2
+   2.1.5
    2.1.4
    2.1.3
    2.1.2

docs/topics/deploying.rst

@@ -22,9 +22,13 @@ Install all system dependencies::
 
     apt-get install nginx supervisor redis-server postgresql \
     libpq-dev libjpeg-dev libmagic1 libpng-dev libreoffice \
-    libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv \
+    libtiff-dev gcc ghostscript gnupg python-dev python-virtualenv \
     tesseract-ocr poppler-utils -y
 
+If using Ubuntu 16.10 also install GPG version 1 (as GPG version 2 is the new default for this distribution and not yet supported by Mayan EDMS) ::
+
+    apt-get install gnupg1 -y
+
 Change to the directory where the project will be deployed::
 
     cd /usr/share
@@ -81,6 +85,9 @@ Append the following to the ``mayan/settings/local.py`` file, paying attention t
 
     BROKER_URL = 'redis://127.0.0.1:6379/0'
     CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0'
+
+If using Ubuntu 16.10, also add this line to the ``mayan/settings/local.py`` file::
+
     SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
 
 Migrate the database or initialize the project::

mayan/settings/testing/base.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 from ..base import *  # NOQA
 
-SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
-
 INSTALLED_APPS += ('test_without_migrations',)
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',

mayan/settings/testing/gitlab-ci/__init__.py

@@ -1 +1,4 @@
 from ..base import *  # NOQA
+
+SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
+

setup.py

@@ -57,7 +57,7 @@ def find_packages(directory):
 
 install_requires = """
 Django==1.8.15
-Pillow==3.1.0
+Pillow==3.1.2
 PyYAML==3.11
 celery==3.1.19
 cssmin==0.2.0