Merge branch 'versions/minor' into features/redactions_upstream_merge

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>

.gitlab-ci.yml

@@ -63,6 +63,7 @@ job_docker_nightly:
   only:
     - nightly
     - staging
+    - /^clients\/.+$/
 
 job_documentation_build:
   stage: build_documentation
@@ -160,6 +161,7 @@ job_push_python:
     - releases/python
     - staging
     - nightly
+    - /^clients\/.+$/
 
 test-mysql:
   <<: *test_base

.tx/config

@@ -115,6 +115,12 @@ source_lang = en
 source_file = mayan/apps/events/locale/en/LC_MESSAGES/django.po
 type = PO
 
+[mayan-edms.file_caching-3-0]
+file_filter = mayan/apps/file_caching/locale/<lang>/LC_MESSAGES/django.po
+source_lang = en
+source_file = mayan/apps/file_caching/locale/en/LC_MESSAGES/django.po
+type = PO
+
 [mayan-edms.file_metadata-3-0]
 file_filter = mayan/apps/file_metadata/locale/<lang>/LC_MESSAGES/django.po
 source_lang = en
@@ -222,3 +228,10 @@ file_filter = mayan/apps/user_management/locale/<lang>/LC_MESSAGES/django.po
 source_lang = en
 source_file = mayan/apps/user_management/locale/en/LC_MESSAGES/django.po
 type = PO
+
+[mayan-edms.weblink-3-0]
+file_filter = mayan/apps/weblinks/locale/<lang>/LC_MESSAGES/django.po
+source_lang = en
+source_file = mayan/apps/weblinks/locale/en/LC_MESSAGES/django.po
+type = PO
+

CHANGES_BC.rst

@@ -0,0 +1,10 @@
+- Use Select2 widget for the document type selection form.
+- Update source column matching to be additive and not exclusive.
+- Add two columns to show the number of documents per workflow and
+  workflow state.
+- Sort module.
+- Add link to sort individual indexes.
+- Support exclusions from source columns.
+- Improve source column exclusion. Improve for model subclasses in partial querysets.
+- Add sortable index instance label column.
+- Add rectangle drawing transformation.

Makefile

@@ -18,7 +18,7 @@ clean-pyc: ## Remove Python artifacts.
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
-
+	find . -name '__pycache__' -exec rm -R -f {} + 
 
 # Testing
 
@@ -234,10 +234,10 @@ generate-requirements: ## Generate all requirements files from the project deped
 # Dev server
 
 runserver: ## Run the development server.
-	./manage.py runserver --settings=mayan.settings.development $(ADDRPORT)
+	./manage.py runserver --nothreading --settings=mayan.settings.development $(ADDRPORT)
 
 runserver_plus: ## Run the Django extension's development server.
-	./manage.py runserver_plus --settings=mayan.settings.development $(ADDRPORT)
+	./manage.py runserver_plus --nothreading --settings=mayan.settings.development $(ADDRPORT)
 
 shell_plus: ## Run the shell_plus command.
 	./manage.py shell_plus --settings=mayan.settings.development
@@ -258,7 +258,7 @@ test-with-docker-frontend: ## Launch a front end instance that uses the producti
 	./manage.py runserver --settings=mayan.settings.staging.docker
 
 test-with-docker-worker: ## Launch a worker instance that uses the production-like services.
-	./manage.py celery worker --settings=mayan.settings.staging.docker -B -l INFO -O fair
+	DJANGO_SETTINGS_MODULE=mayan.settings.staging.docker ./manage.py celery worker -A mayan -B -l INFO -O fair
 
 docker-mysql-on: ## Launch and initialize a MySQL Docker container.
 	docker run -d --name mysql -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=True -e MYSQL_DATABASE=mayan_edms mysql

README.md

@@ -1,11 +1,11 @@
-[![Donation](https://img.shields.io/badge/donation-PayPal-brightgreen)](https://paypal.me/MayanEDMS)
 [![pypi][pypi]][pypi-url]
 [![builds][builds]][builds-url]
+[![coverage][cover]][cover-url]
 ![python][python]
 ![license][license]
 [![Docker pulls](https://img.shields.io/docker/pulls/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
 [![Docker Stars](https://img.shields.io/docker/stars/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
-
+[![Docker layers](https://images.microbadger.com/badges/image/mayanedms/mayanedms.svg)](https://microbadger.com/images/mayanedms/mayanedms)
 
 [pypi]: http://img.shields.io/pypi/v/mayan-edms.svg
 [pypi-url]: http://badge.fury.io/py/mayan-edms
@@ -43,20 +43,6 @@
 
 </div>
 
-<h2 align="center">Book</h2>
-
-The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
-
-<p align="center">
-    <a href="https://sellfy.com/p/um2fkx/">
-        <img width="400" src="https://d12swbtw719y4s.cloudfront.net/images/v6RpxW40/aP0qKLjkPiAuXZhYuB45/wDAULAzFyx.jpeg?w=548">
-    </a>
-</p>
-
-Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
-
-The link is https://sellfy.com/p/um2fkx/
-
 <h2 align="center">Installation</h2>
 
 The easiest way to use Mayan EDMS is by using the official

README.rst

@@ -1,4 +1,4 @@
-|donation| |pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|
+|pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|
 
 
 .. image:: https://gitlab.com/mayan-edms/mayan-edms/raw/master/docs/_static/mayan_logo.png
@@ -25,16 +25,6 @@ at: https://docs.mayan-edms.com/topics/installation.html
 
 .. _Docker: https://www.docker.com/
 
-The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
-
-.. image:: https://camo.githubusercontent.com/89d2fe787507c9247aa7bb406e2682b53eb7a5f9/68747470733a2f2f64313273776274773731397934732e636c6f756466726f6e742e6e65742f696d616765732f76365270785734302f615030714b4c6a6b50694175585a6859754234352f774441554c417a4679782e6a7065673f773d353438
-    :align: center
-    :width: 300
-    :target: https://sellfy.com/p/um2fkx/
-
-Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
-Click the image or visit: https://sellfy.com/p/um2fkx/
-
 Hardware requirements
 
 - 2 Gigabytes of RAM (1 Gigabyte if OCR is turned off).
@@ -54,8 +44,6 @@ Important links
 - `Videos <https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw>`__
 
 
-.. |donation| image:: https://img.shields.io/badge/donation-PayPal-brightgreen
-   :target: https://paypal.me/MayanEDMS
 .. |pypi| image:: http://img.shields.io/pypi/v/mayan-edms.svg
    :target: http://badge.fury.io/py/mayan-edms
 .. |builds| image:: https://gitlab.com/mayan-edms/mayan-edms/badges/master/build.svg

contrib/scripts/install/development.sh

@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-INSTALLATION_DIRECTORY=/home/vagrant/mayan-edms/
-DB_NAME=mayan_edms
-DB_PASSWORD=test123
-
-cat << EOF | sudo tee -a /etc/motd.tail
-**********************************sudo apt
-
-Mayan EDMS Vagrant Development Box
-
-**********************************
-EOF
-
-# Update sources
-echo -e "\n -> Running apt-get update & upgrade \n"
-sudo apt-get -qq update
-sudo apt-get -y upgrade
-
-echo -e "\n -> Installing core binaries \n"
-sudo apt-get -y install git-core python-virtualenv gcc python-dev libjpeg-dev libpng-dev libtiff-dev tesseract-ocr poppler-utils libreoffice
-
-echo -e "\n -> Cloning development branch of repository \n"
-git clone /mayan-edms-repository/ $INSTALLATION_DIRECTORY
-cd $INSTALLATION_DIRECTORY
-git checkout development
-git reset HEAD --hard
-
-echo -e "\n -> Setting up virtual env \n"
-virtualenv venv
-source venv/bin/activate
-
-echo -e "\n -> Installing python dependencies \n"
-pip install -r requirements.txt
-
-echo -e "\n -> Running Mayan EDMS initial setup \n"
-./manage.py initialsetup
-
-echo -e "\n -> Installing Redis server \n"
-sudo apt-get install -y redis-server
-pip install redis
-
-echo -e "\n -> Installing testing software \n"
-pip install coverage
-
-echo -e "\n -> Installing MySQL \n"
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password '$DB_PASSWORD
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password '$DB_PASSWORD
-sudo apt-get install -y mysql-server libmysqlclient-dev
-# Create a passwordless root and travis users
-mysql -u root -p$DB_PASSWORD -e "SET PASSWORD = PASSWORD('');"
-mysql -u root -e "CREATE USER 'travis'@'localhost' IDENTIFIED BY '';GRANT ALL PRIVILEGES ON * . * TO 'travis'@'localhost';FLUSH PRIVILEGES;"
-mysql -u travis -e "CREATE DATABASE $DB_NAME;"
-pip install mysql-python
-
-echo -e "\n -> Installing PostgreSQL \n"
-sudo apt-get install -y postgresql postgresql-server-dev-all
-sudo -u postgres psql -c 'create database mayan_edms;' -U postgres
-sudo cat > /etc/postgresql/9.3/main/pg_hba.conf << EOF
-local   all             postgres                                trust
-
-# TYPE  DATABASE        USER            ADDRESS                 METHOD
-
-# "local" is for Unix domain socket connections only
-local   all             all                                     peer
-# IPv4 local connections:
-host    all             all             127.0.0.1/32            md5
-# IPv6 local connections:
-host    all             all             ::1/128                 md5
-EOF
-
-pip install -q psycopg2

contrib/scripts/install/production.sh

@@ -1,171 +0,0 @@
-#!/usr/bin/env bash
-
-# ====== CONFIG ======
-INSTALLATION_DIRECTORY=/usr/share/mayan-edms/
-DB_NAME=mayan_edms
-DB_USERNAME=mayan
-DB_PASSWORD=test123
-# ==== END CONFIG ====
-
-cat << EOF | tee -a /etc/motd.tail
-**********************************
-
-Mayan EDMS Vagrant Production Box
-
-**********************************
-EOF
-
-echo -e "\n -> Running apt-get update & upgrade \n"
-apt-get -qq update
-apt-get -y upgrade
-
-echo -e "\n -> Installing core binaries \n"
-apt-get install nginx supervisor redis-server postgresql libpq-dev libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gpgv python-dev python-virtualenv tesseract-ocr poppler-utils -y
-
-echo -e "\n -> Setting up virtualenv \n"
-rm -f ${INSTALLATION_DIRECTORY}
-virtualenv ${INSTALLATION_DIRECTORY}
-source ${INSTALLATION_DIRECTORY}bin/activate
-
-echo -e "\n -> Installing Mayan EDMS from PyPI \n"
-pip install mayan-edms
-
-echo -e "\n -> Installing Python client for PostgreSQL, Redis, and uWSGI \n"
-pip install psycopg2 redis uwsgi
-
-echo -e "\n -> Creating the database for the installation \n"
-echo "CREATE USER mayan WITH PASSWORD '$DB_PASSWORD';" | sudo -u postgres psql
-sudo -u postgres createdb -O $DB_USERNAME $DB_NAME
-
-echo -e "\n -> Creating the directories for the logs \n"
-mkdir /var/log/mayan
-
-echo -e "\n -> Making a convenience symlink \n"
-cd ${INSTALLATION_DIRECTORY}
-ln -s lib/python2.7/site-packages/mayan .
-
-echo -e "\n -> Creating an initial settings file \n"
-mayan-edms.py createsettings
-
-echo -e "\n -> Updating the mayan/settings/local.py file \n"
-cat >> mayan/settings/local.py << EOF
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': '$DB_NAME',
-        'USER': '$DB_USERNAME',
-        'PASSWORD': '$DB_PASSWORD',
-        'HOST': 'localhost',
-        'PORT': '5432',
-    }
-}
-
-BROKER_URL = 'redis://127.0.0.1:6379/0'
-CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0'
-EOF
-
-echo -e "\n -> Migrating the database or initialize the project \n"
-mayan-edms.py initialsetup
-
-echo -e "\n -> Disabling the default NGINX site \n"
-rm -f /etc/nginx/sites-enabled/default
-
-echo -e "\n -> Creating a uwsgi.ini file \n"
-cat > uwsgi.ini << EOF
-[uwsgi]
-chdir = ${INSTALLATION_DIRECTORY}lib/python2.7/site-packages/mayan
-chmod-socket = 664
-chown-socket = www-data:www-data
-env = DJANGO_SETTINGS_MODULE=mayan.settings.production
-gid = www-data
-logto = /var/log/uwsgi/%n.log
-pythonpath = ${INSTALLATION_DIRECTORY}lib/python2.7/site-packages
-master = True
-max-requests = 5000
-socket = ${INSTALLATION_DIRECTORY}uwsgi.sock
-uid = www-data
-vacuum = True
-wsgi-file = ${INSTALLATION_DIRECTORY}lib/python2.7/site-packages/mayan/wsgi.py
-EOF
-
-echo -e "\n -> Creating the directory for the uWSGI log files \n"
-mkdir -p /var/log/uwsgi
-
-echo -e "\n -> Creating the NGINX site file for Mayan EDMS, /etc/nginx/sites-available/mayan \n"
-cat > /etc/nginx/sites-available/mayan << EOF
-server {
-    listen 80;
-    server_name localhost;
-
-    location / {
-        include uwsgi_params;
-        uwsgi_pass unix:${INSTALLATION_DIRECTORY}uwsgi.sock;
-
-        client_max_body_size 30M;  # Increse if your plan to upload bigger documents
-        proxy_read_timeout 30s;  # Increase if your document uploads take more than 30 seconds
-    }
-
-    location /static {
-        alias ${INSTALLATION_DIRECTORY}mayan/media/static;
-        expires 1h;
-    }
-
-    location /favicon.ico {
-        alias ${INSTALLATION_DIRECTORY}mayan/media/static/appearance/images/favicon.ico;
-        expires 1h;
-    }
-}
-EOF
-
-echo -e "\n -> Enabling the NGINX site for Mayan EDMS \n"
-ln -s /etc/nginx/sites-available/mayan /etc/nginx/sites-enabled/
-
-echo -e "\n -> Creating the supervisor file for the uWSGI process, /etc/supervisor/conf.d/mayan-uwsgi.conf \n"
-cat > /etc/supervisor/conf.d/mayan-uwsgi.conf << EOF
-[program:mayan-uwsgi]
-command = ${INSTALLATION_DIRECTORY}bin/uwsgi --ini ${INSTALLATION_DIRECTORY}uwsgi.ini
-user = root
-autostart = true
-autorestart = true
-redirect_stderr = true
-EOF
-
-echo -e "\n -> Creating the supervisor file for the Celery worker, /etc/supervisor/conf.d/mayan-celery.conf \n"
-cat > /etc/supervisor/conf.d/mayan-celery.conf << EOF
-[program:mayan-worker]
-command = ${INSTALLATION_DIRECTORY}bin/python ${INSTALLATION_DIRECTORY}bin/mayan-edms.py celery --settings=mayan.settings.production worker -Ofair -l ERROR
-directory = ${INSTALLATION_DIRECTORY}
-user = www-data
-stdout_logfile = /var/log/mayan/worker-stdout.log
-stderr_logfile = /var/log/mayan/worker-stderr.log
-autostart = true
-autorestart = true
-startsecs = 10
-stopwaitsecs = 10
-killasgroup = true
-priority = 998
-
-[program:mayan-beat]
-command = ${INSTALLATION_DIRECTORY}bin/python ${INSTALLATION_DIRECTORY}bin/mayan-edms.py celery --settings=mayan.settings.production beat -l ERROR
-directory = ${INSTALLATION_DIRECTORY}
-user = www-data
-numprocs = 1
-stdout_logfile = /var/log/mayan/beat-stdout.log
-stderr_logfile = /var/log/mayan/beat-stderr.log
-autostart = true
-autorestart = true
-startsecs = 10
-stopwaitsecs = 1
-killasgroup = true
-priority = 998
-EOF
-
-echo -e "\n -> Collecting the static files \n"
-mayan-edms.py preparestatic --noinput
-
-echo -e "\n -> Making the installation directory readable and writable by the webserver user \n"
-chown www-data:www-data ${INSTALLATION_DIRECTORY} -R
-
-echo -e "\n -> Restarting the services \n"
-/etc/init.d/nginx restart
-/etc/init.d/supervisor restart

contrib/scripts/process_messages.py

@@ -13,11 +13,12 @@ APP_LIST = (
     'checkouts', 'common', 'converter', 'dashboards', 'dependencies',
     'django_gpg', 'document_comments', 'document_indexing',
     'document_parsing', 'document_signatures', 'document_states',
-    'documents', 'dynamic_search', 'events', 'file_metadata', 'linking',
-    'lock_manager', 'mayan_statistics', 'mailer', 'metadata', 'mirroring',
-    'motd', 'navigation', 'ocr', 'permissions', 'platform', 'rest_api',
-    'smart_settings', 'sources', 'storage', 'tags', 'task_manager',
-    'user_management'
+    'documents', 'dynamic_search', 'events', 'file_caching',
+    'file_metadata', 'linking', 'lock_manager', 'mailer',
+    'mayan_statistics', 'metadata', 'mirroring', 'motd', 'navigation',
+    'ocr', 'permissions', 'platform', 'rest_api', 'smart_settings',
+    'sources', 'storage', 'tags', 'task_manager', 'user_management',
+    'weblinks'
 )
 
 LANGUAGE_LIST = (

contrib/scripts/start_gunicorn.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-NAME="mayan-edms"
-DJANGODIR=/usr/share/mayan-edms
-SOCKFILE=/var/tmp/filesystem.sock
-USER=www-data
-GROUP=www-data
-NUM_WORKERS=3
-DJANGO_SETTINGS_MODULE=mayan.settings.production
-DJANGO_WSGI_MODULE=mayan.wsgi
-TIMEOUT=600
-
-echo "Starting $NAME as `whoami`"
-
-# Activate the virtual environment
-cd $DJANGODIR
-source bin/activate
-export DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE
-export PYTHONPATH=$DJANGODIR:$PYTHONPATH
-
-# Create the run directory if it doesn't exist
-RUNDIR=$(dirname $SOCKFILE)
-test -d $RUNDIR || mkdir -p $RUNDIR
-
-# Start your Django Unicorn
-# Programs meant to be run under supervisor should not daemonize themselves (do not use --daemon)
-exec bin/gunicorn ${DJANGO_WSGI_MODULE}:application \
-  --name $NAME \
-  --workers $NUM_WORKERS \
-  --user=$USER --group=$GROUP \
-  --log-level=debug \
-  --bind=unix:$SOCKFILE \
-  --timeout=$TIMEOUT
-
-

docker/Dockerfile

@@ -4,7 +4,7 @@
 # BASE_IMAGE - Bare bones image with the base packages needed to run Mayan EDMS
 ####
 
-FROM debian:9.8-slim as BASE_IMAGE
+FROM debian:10.0-slim as BASE_IMAGE
 
 LABEL maintainer="Roberto Rosario roberto.rosario@mayan-edms.com"
 
@@ -22,6 +22,7 @@ RUN set -x \
 && DEBIAN_FRONTEND=noninteractive \
 apt-get update \
 && apt-get install -y --no-install-recommends \
+    ca-certificates \
     exiftool \
     ghostscript \
     gpgv \
@@ -29,11 +30,11 @@ apt-get update \
     graphviz \
     libfuse2 \
     libmagic1 \
-    libmariadbclient18 \
+    libmariadb3 \
     libreoffice \
     libpq5 \
     poppler-utils \
-    redis-server \
+    python3-distutils \
     sane-utils \
     sudo \
     supervisor \
@@ -52,22 +53,20 @@ apt-get update \
 && if [ "$(uname -m)" = "armv7l" ]; then \
     ln -s /usr/lib/arm-linux-gnueabihf/libz.so /usr/lib/ \
     && ln -s /usr/lib/arm-linux-gnueabihf/libjpeg.so /usr/lib/ \
-; fi \
-# Discard data when Redis runs out of memory
-&& echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf \
-# Disable saving the Redis database
-echo "save \"\"" >> /etc/redis/redis.conf \
-# Only provision 1 database
-&& echo "databases 1" >> /etc/redis/redis.conf
-
+; fi
 
 ####
-# BUILDER_IMAGE - This image buildS the Python package and is discarded afterwards
+# BUILDER_IMAGE - This image builds the Python package and is discarded afterwards
+#                 only the build artifact is carried over to the next image.
 ####
 
 # Reuse image
 FROM BASE_IMAGE as BUILDER_IMAGE
 
+# Python libraries caching
+ARG PIP_INDEX_URL
+ARG PIP_TRUSTED_HOST
+
 WORKDIR /src
 
 # Copy the source files needed to build the Python package
@@ -96,39 +95,40 @@ apt-get install -y --no-install-recommends \
     libssl-dev \
     g++ \
     gcc \
-    python-dev \
-    python-virtualenv \
+    python3-dev \
+    python3-venv \
 && mkdir -p "${PROJECT_INSTALL_DIR}" \
 && chown -R mayan:mayan "${PROJECT_INSTALL_DIR}" \
 && chown -R mayan:mayan /src
 
 USER mayan
-RUN python -m virtualenv "${PROJECT_INSTALL_DIR}" \
+RUN python3 -m venv "${PROJECT_INSTALL_DIR}" \
 && . "${PROJECT_INSTALL_DIR}/bin/activate" \
-&& pip install --no-cache-dir --no-use-pep517 \
-    librabbitmq==1.6.1 \
-    mysql-python==1.2.5 \
-    psycopg2==2.7.3.2 \
-    redis==2.10.6 \
+&& pip install --no-cache-dir \
+    librabbitmq==2.0.0 \
+    mysqlclient==1.4.2.post1 \
+    psycopg2==2.8.3 \
+    redis==3.2.1 \
+    flower==0.9.3 \
 # psutil is needed by ARM builds otherwise gevent and gunicorn fail to start
 && UNAME=`uname -m` && if [ "${UNAME#*arm}" != $UNAME ]; then \
-    pip install --no-cache-dir --no-use-pep517 \
+    pip install --no-cache-dir \
     psutil==5.6.2 \
 ; fi \
 # Install the Python packages needed to build Mayan EDMS
-&& pip install --no-cache-dir --no-use-pep517 -r /src/requirements/build.txt \
+&& pip install --no-cache-dir -r /src/requirements/build.txt \
 # Build Mayan EDMS
-&& python setup.py sdist \
+&& python3 setup.py sdist \
 # Install the built Mayan EDMS package
-&& pip install --no-cache-dir --no-use-pep517 dist/mayan* \
+&& pip install --no-cache-dir dist/mayan* \
 # Install the static content
-&& mayan-edms.py installjavascript \
+&& mayan-edms.py installdependencies \
 && MAYAN_STATIC_ROOT=${PROJECT_INSTALL_DIR}/static mayan-edms.py preparestatic --link --noinput
 
 COPY --chown=mayan:mayan requirements/testing-base.txt "${PROJECT_INSTALL_DIR}"
 
 ####
-# Final image - BASE_IMAGE + Mayan install directory from the builder image
+# Final image - BASE_IMAGE + BUILDER_IMAGE artifact (Mayan install directory)
 ####
 
 FROM BASE_IMAGE
@@ -144,7 +144,7 @@ VOLUME ["/var/lib/mayan"]
 ENTRYPOINT ["entrypoint.sh"]
 
 EXPOSE 8000
-CMD ["mayan"]
+CMD ["run_all"]
 
 RUN ${PROJECT_INSTALL_DIR}/bin/mayan-edms.py platformtemplate supervisord_docker > /etc/supervisor/conf.d/mayan.conf \
 && apt-get clean autoclean \

docker/Makefile

@@ -1,4 +1,9 @@
-APT_PROXY ?= `/sbin/ip route|awk '/docker0/ { print $$9 }'`:3142
+HOST_IP = `/sbin/ip route|awk '/docker0/ { print $$9 }'`
+
+APT_PROXY ?= $(HOST_IP):3142
+PIP_INDEX_URL ?= http://$(HOST_IP):3141/root/pypi/+simple/
+PIP_TRUSTED_HOST ?= $(HOST_IP)
+
 IMAGE_VERSION ?= `cat docker/rootfs/version`
 CONSOLE_COLUMNS ?= `echo $$(tput cols)`
 CONSOLE_LINES ?= `echo $$(tput lines)`
@@ -7,7 +12,7 @@ docker-build: ## Build a new image locally.
 	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile .
 
 docker-build-with-proxy: ## Build a new image locally using an APT proxy as APT_PROXY.
-	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile --build-arg APT_PROXY=$(APT_PROXY) .
+	docker build -t mayanedms/mayanedms:$(IMAGE_VERSION) -f docker/Dockerfile --build-arg APT_PROXY=$(APT_PROXY) --build-arg PIP_INDEX_URL=$(PIP_INDEX_URL) --build-arg PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY) .
 
 docker-shell: ## Launch a bash instance inside a running container. Pass the container name via DOCKER_CONTAINER.
 	docker exec -e TERM=$(TERM) -e "COLUMNS=$(CONSOLE_COLUMNS)" -e "LINES=$(CONSOLE_LINES)" -it $(DOCKER_CONTAINER) /bin/bash
@@ -23,3 +28,13 @@ docker-test-cleanup: ## Delete the test container and the test volume.
 docker-test-all: ## Build and executed the test suite in a test container.
 docker-test-all: docker-build-with-proxy
 	docker run --rm run-tests
+
+docker-compose-build:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms build
+
+docker-compose-build-with-proxy:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms build --build-arg APT_PROXY=$(APT_PROXY) --build-arg PIP_INDEX_URL=$(PIP_INDEX_URL) --build-arg PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY)
+
+docker-compose-up:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms up
+

docker/docker-compose-development.yml

@@ -1,72 +0,0 @@
-version: '2.1'
-
-volumes:
-    broker:
-        driver: local
-    app:
-        driver: local
-    db:
-        driver: local
-    results:
-        driver: local
-
-services:
-  broker:
-    container_name: mayan-edms-broker
-    image: healthcheck/rabbitmq
-    environment:
-      RABBITMQ_DEFAULT_USER: mayan
-      RABBITMQ_DEFAULT_PASS: mayan
-      RABBITMQ_DEFAULT_VHOST: mayan
-    volumes:
-      - broker:/var/lib/rabbitmq
-  results:
-    container_name: mayan-edms-results
-    image: healthcheck/redis
-    volumes:
-      - results:/data
-  #db:
-  #  container_name: mayan-edms-db
-  #  image: healthcheck/mysql
-  #  environment:
-  #    MYSQL_DATABASE: mayan
-  #    MYSQL_PASSWORD: mayan-password
-  #    MYSQL_ROOT_PASSWORD: root-password
-  #    MYSQL_USER: mayan
-  #  volumes:
-  #    - db:/var/lib/mysql
-  db:
-    container_name: mayan-edms-db
-    image: healthcheck/postgres
-    environment:
-      POSTGRES_DB: mayan
-      POSTGRES_PASSWORD: mayan-password
-      POSTGRES_USER: mayan
-    volumes:
-      - db:/var/lib/postgresql/data
-  mayan-edms:
-    container_name: mayan-edms-app
-    image: mayan-edms/next
-    build:
-      context: ./
-      args:
-        - APT_PROXY=172.18.0.1:3142
-    depends_on:
-      broker:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-      results:
-        condition: service_healthy
-    environment:
-      MAYAN_BROKER_URL: amqp://mayan:mayan@broker:5672/mayan
-      MAYAN_CELERY_RESULT_BACKEND: redis://results:6379/0
-      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
-      MAYAN_DATABASE_HOST: db
-      MAYAN_DATABASE_NAME: mayan
-      MAYAN_DATABASE_PASSWORD: mayan-password
-      MAYAN_DATABASE_USER: mayan
-    ports:
-      - "80:80"
-    volumes:
-      - app:/var/lib/mayan

docker/docker-compose.yml

@@ -1,58 +1,130 @@
-version: '2.1'
+version: '3.7'
 
-volumes:
-    broker:
-        driver: local
-    app:
-        driver: local
-    db:
-        driver: local
-    results:
-        driver: local
+networks:
+  mayan-bridge:
+    driver: bridge
 
 services:
-  broker:
-    container_name: mayan-edms-broker
-    image: healthcheck/rabbitmq
-    environment:
-      RABBITMQ_DEFAULT_USER: mayan
-      RABBITMQ_DEFAULT_PASS: mayan
-      RABBITMQ_DEFAULT_VHOST: mayan
-    volumes:
-      - broker:/var/lib/rabbitmq
-  results:
-    container_name: mayan-edms-results
-    image: healthcheck/redis
-    volumes:
-      - results:/data
-  db:
-    container_name: mayan-edms-db
-    image: healthcheck/postgres
-    environment:
-      POSTGRES_DB: mayan
-      POSTGRES_PASSWORD: mayan-password
-      POSTGRES_USER: mayan
-    volumes:
-      - db:/var/lib/postgresql/data
-  mayan-edms:
-    container_name: mayan-edms-app
-    image: mayanedms/mayanedms:latest
+  app:
+    build:
+      context: ..
+      dockerfile: ./docker/Dockerfile
     depends_on:
-      broker:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-      results:
-        condition: service_healthy
-    environment:
-      MAYAN_BROKER_URL: amqp://mayan:mayan@broker:5672/mayan
-      MAYAN_CELERY_RESULT_BACKEND: redis://results:6379/0
-      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
-      MAYAN_DATABASE_HOST: db
-      MAYAN_DATABASE_NAME: mayan
-      MAYAN_DATABASE_PASSWORD: mayan-password
-      MAYAN_DATABASE_USER: mayan
+      - postgresql
+      - redis
+      # Enable to use RabbitMQ
+      #- rabbitmq
+    environment: &mayan_env
+      # Enable to use RabbitMQ
+      # MAYAN_CELERY_BROKER_URL: amqp://mayan:mayanrabbitpass@broker:5672/mayan
+      # Disable Redis Broker to use RabbitMQ as Broker
+      MAYAN_CELERY_BROKER_URL: redis://redis:6379/1
+      MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/0
+      MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'postgresql'}}"
+    image: mayanedms/mayanedms:3.2.6
+    networks:
+      - mayan-bridge
     ports:
       - "80:8000"
+    restart: unless-stopped
     volumes:
-      - app:/var/lib/mayan
+      - /docker-volumes/mayan-edms/media:/var/lib/mayan
+
+  postgresql:
+    environment:
+      POSTGRES_DB: mayan
+      POSTGRES_PASSWORD: mayandbpass
+      POSTGRES_USER: mayan
+    image: postgres:9.6
+    networks:
+      - mayan-bridge
+    restart: unless-stopped
+    volumes:
+      - /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data
+
+  redis:
+    command:
+      - redis-server
+      - --databases
+      - "2"
+      - --maxmemory-policy
+      - allkeys-lru
+      - --save
+      - ""
+    image: redis:5.0
+    networks:
+      - mayan-bridge
+    restart: unless-stopped
+
+  # Optional services
+
+  # celery_flower:
+  #   command:
+  #     - run_celery
+  #     - flower
+  #   depends_on:
+  #     - postgresql
+  #     - redis
+  #     # Enable to use RabbitMQ
+  #     # - rabbitmq
+  #   environment:
+  #     <<: *mayan_env
+  #   image: mayanedms/mayanedms:3.2.6
+  #   networks:
+  #     - mayan-bridge
+  #   ports:
+  #     - "5555:5555"
+  #   restart: unless-stopped
+
+  # Enable to use RabbitMQ
+  # rabbitmq:
+  #   container_name: mayan-edms-rabbitmq
+  #   image: healthcheck/rabbitmq
+  #   environment:
+  #     RABBITMQ_DEFAULT_USER: mayan
+  #     RABBITMQ_DEFAULT_PASS: mayanrabbitpass
+  #     RABBITMQ_DEFAULT_VHOST: mayan
+  #   networks:
+  #     - mayan-bridge
+  #   restart: unless-stopped
+  #   volumes:
+  #     - /docker-volumes/mayan-edms/rabbitmq:/var/lib/rabbitmq
+
+  # Enable to run stand alone workers
+  # worker_fast:
+  #   command:
+  #     - run_worker
+  #     - fast
+  #   depends_on:
+  #     - postgresql
+  #     - redis
+  #     # Enable to use RabbitMQ
+  #     # - rabbitmq
+  #   environment:
+  #     <<: *mayan_env
+  #   image: mayanedms/mayanedms:3.2.6
+  #   networks:
+  #     - mayan-bridge
+  #   restart: unless-stopped
+  #   volumes:
+  #     - /docker-volumes/mayan-edms/media:/var/lib/mayan
+
+  # Enable to run stand frontend gunicorn
+  # frontend:
+  #   command:
+  #     - run_frontend
+  #   depends_on:
+  #     - postgresql
+  #     - redis
+  #     # Enable to use RabbitMQ
+  #     # - rabbitmq
+  #   environment:
+  #     <<: *mayan_env
+  #   image: mayanedms/mayanedms:3.2.6
+  #   networks:
+  #     - mayan-bridge
+  #   ports:
+  #     - "81:8000"
+  #   restart: unless-stopped
+  #   volumes:
+  #     - /docker-volumes/mayan-edms/media:/var/lib/mayan

docker/rootfs/usr/local/bin/entrypoint.sh

@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/bash
+
+# Use bash and not sh to support argument slicing "${@:2}"
+# sh defaults to dash instead of bash.
 
 set -e
 echo "mayan: starting entrypoint.sh"
@@ -8,20 +11,13 @@ CONCURRENCY_ARGUMENT=--concurrency=
 DEFAULT_USER_UID=1000
 DEFAULT_USER_GID=1000
 
-MAYAN_USER_UID=${MAYAN_USER_UID:-${DEFAULT_USER_UID}}
-MAYAN_USER_GID=${MAYAN_USER_GID:-${DEFAULT_USER_GID}}
-
-export MAYAN_DEFAULT_BROKER_URL=redis://127.0.0.1:6379/0
-export MAYAN_DEFAULT_CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
-
 export MAYAN_ALLOWED_HOSTS='["*"]'
 export MAYAN_BIN=/opt/mayan-edms/bin/mayan-edms.py
-export MAYAN_BROKER_URL=${MAYAN_BROKER_URL:-${MAYAN_DEFAULT_BROKER_URL}}
-export MAYAN_CELERY_RESULT_BACKEND=${MAYAN_CELERY_RESULT_BACKEND:-${MAYAN_DEFAULT_CELERY_RESULT_BACKEND}}
 export MAYAN_INSTALL_DIR=/opt/mayan-edms
 export MAYAN_PYTHON_BIN_DIR=/opt/mayan-edms/bin/
 export MAYAN_MEDIA_ROOT=/var/lib/mayan
 export MAYAN_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE:-mayan.settings.production}
+export DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}
 
 export MAYAN_GUNICORN_BIN=${MAYAN_PYTHON_BIN_DIR}gunicorn
 export MAYAN_GUNICORN_WORKERS=${MAYAN_GUNICORN_WORKERS:-2}
@@ -29,22 +25,9 @@ export MAYAN_GUNICORN_TIMEOUT=${MAYAN_GUNICORN_TIMEOUT:-120}
 export MAYAN_PIP_BIN=${MAYAN_PYTHON_BIN_DIR}pip
 export MAYAN_STATIC_ROOT=${MAYAN_INSTALL_DIR}/static
 
-MAYAN_WORKER_FAST_CONCURRENCY=${MAYAN_WORKER_FAST_CONCURRENCY:-1}
-MAYAN_WORKER_MEDIUM_CONCURRENCY=${MAYAN_WORKER_MEDIUM_CONCURRENCY:-1}
-MAYAN_WORKER_SLOW_CONCURRENCY=${MAYAN_WORKER_SLOW_CONCURRENCY:-1}
-
-update_uid_gid() {
-    echo "mayan: update_uid_gid()"
-    groupmod mayan -g ${MAYAN_USER_GID} 2>/dev/null || true
-    usermod mayan -u ${MAYAN_USER_UID} -g ${MAYAN_USER_GID} 2>/dev/null
-
-    if [ ${MAYAN_USER_UID} -ne ${DEFAULT_USER_UID} ] || [ ${MAYAN_USER_GID} -ne ${DEFAULT_USER_GID} ]; then
-        echo "mayan: Updating file ownership. This might take a while if there are many documents."
-        chown mayan:mayan ${MAYAN_INSTALL_DIR} ${MAYAN_STATIC_ROOT} ${MAYAN_MEDIA_ROOT}
-    fi
-}
-
-update_uid_gid
+MAYAN_WORKER_FAST_CONCURRENCY=${MAYAN_WORKER_FAST_CONCURRENCY:-0}
+MAYAN_WORKER_MEDIUM_CONCURRENCY=${MAYAN_WORKER_MEDIUM_CONCURRENCY:-0}
+MAYAN_WORKER_SLOW_CONCURRENCY=${MAYAN_WORKER_SLOW_CONCURRENCY:-0}
 
 if [ "$MAYAN_WORKER_FAST_CONCURRENCY" -eq 0 ]; then
     MAYAN_WORKER_FAST_CONCURRENCY=
@@ -67,11 +50,9 @@ else
 fi
 export MAYAN_WORKER_SLOW_CONCURRENCY
 
-export CELERY_ALWAYS_EAGER=False
+# Allow importing of user setting modules
 export PYTHONPATH=$PYTHONPATH:$MAYAN_MEDIA_ROOT
 
-chown mayan:mayan /var/lib/mayan -R
-
 apt_get_install() {
     apt-get -q update
     apt-get install -y --force-yes --no-install-recommends --auto-remove "$@"
@@ -79,9 +60,9 @@ apt_get_install() {
     rm -rf /var/lib/apt/lists/*
 }
 
-initialize() {
-    echo "mayan: initialize()"
-    su mayan -c "${MAYAN_BIN} initialsetup --force --no-javascript"
+initialsetup() {
+    echo "mayan: initialsetup()"
+    su mayan -c "${MAYAN_BIN} initialsetup --force --no-dependencies"
 }
 
 os_package_installs() {
@@ -98,43 +79,71 @@ pip_installs() {
     fi
 }
 
-start() {
+run_all() {
     echo "mayan: start()"
     rm -rf /var/run/supervisor.sock
     exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
 }
 
-upgrade() {
-    echo "mayan: upgrade()"
-    su mayan -c "${MAYAN_BIN} performupgrade --no-javascript"
+performupgrade() {
+    echo "mayan: performupgrade()"
+    su mayan -c "${MAYAN_BIN} performupgrade --no-dependencies"
+}
+
+make_ready() {
+    # Check if this is a new install, otherwise try to upgrade the existing
+    # installation on subsequent starts
+    if [ ! -f $INSTALL_FLAG ]; then
+        initialsetup
+    else
+        performupgrade
+    fi
+}
+
+set_uid_guid() {
+    echo "mayan: changing uid/guid"
+    usermod mayan -u ${MAYAN_USER_UID:-${DEFAULT_USER_UID}}
+    groupmod mayan -g ${MAYAN_USER_GID:-${DEFAULT_USER_GID}}
 }
 
 os_package_installs || true
 pip_installs || true
+chown mayan:mayan /var/lib/mayan -R
 
 case "$1" in
 
-mayan) # Check if this is a new install, otherwise try to upgrade the existing
-       # installation on subsequent starts
-       if [ ! -f $INSTALL_FLAG ]; then
-           initialize
-       else
-           upgrade
-       fi
-       start
-       ;;
+run_initialsetup)
+    initialsetup
+    ;;
 
-run-tests) # Check if this is a new install, otherwise try to upgrade the existing
-           # installation on subsequent starts
-           if [ ! -f $INSTALL_FLAG ]; then
-               initialize
-           else
-               upgrade
-           fi
-           run-tests.sh
-           ;;
+run_performupgrade)
+    performupgrade
+    ;;
 
-*) su mayan -c "$@";
-   ;;
+run_all)
+    make_ready
+    run_all
+    ;;
+
+run_celery)
+    run_celery.sh "${@:2}"
+    ;;
+
+run_frontend)
+    run_frontend.sh
+    ;;
+
+run_tests)
+    make_ready
+    run_tests.sh
+    ;;
+
+run_worker)
+    run_worker.sh "${@:2}"
+    ;;
+
+*)
+    su mayan -c "$@"
+    ;;
 
 esac

docker/rootfs/usr/local/bin/run_celery.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Use -A and not --app. Both are the same but behave differently
+# -A can be located before the command while --app cannot.
+su mayan -c "${MAYAN_PYTHON_BIN_DIR}celery -A mayan $@"

docker/rootfs/usr/local/bin/run_frontend.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+MAYAN_GUNICORN_MAX_REQUESTS=${MAYAN_GUNICORN_MAX_REQUESTS:-500}
+MAYAN_GUNICORN_MAX_REQUESTS_JITTERS=${MAYAN_GUNICORN_MAX_REQUESTS_JITTERS:-50}
+MAYAN_GUNICORN_WORKER_CLASS=${MAYAN_GUNICORN_WORKER_CLASS:-sync}
+
+su mayan -c "${MAYAN_PYTHON_BIN_DIR}gunicorn -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests ${MAYAN_GUNICORN_MAX_REQUESTS} --max-requests-jitter ${MAYAN_GUNICORN_MAX_REQUESTS_JITTERS} --worker-class ${MAYAN_GUNICORN_WORKER_CLASS} --bind 0.0.0.0:8000 --timeout ${MAYAN_GUNICORN_TIMEOUT}"

docker/rootfs/usr/local/bin/run_worker.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+QUEUE_LIST=`MAYAN_WORKER_NAME=$1 su mayan -c "${MAYAN_PYTHON_BIN_DIR}mayan-edms.py platformtemplate worker_queues"`
+
+# Use -A and not --app. Both are the same but behave differently
+# -A can be located before the command while --app cannot.
+# Pass ${@:2} to allow overriding the defaults arguments
+su mayan -c "${MAYAN_PYTHON_BIN_DIR}celery -A mayan worker -Ofair -l ERROR -Q $QUEUE_LIST ${@:2}"

docker/rootfs/version

@@ -1 +1 @@
-3.2.7
+3.2.6

docker/stack.yml

@@ -9,24 +9,32 @@ volumes:
 services:
 
   db:
-    image: postgres
     environment:
       POSTGRES_DB: mayan
-      POSTGRES_PASSWORD: mayan-password
+      POSTGRES_PASSWORD: mayandbpass
       POSTGRES_USER: mayan
+    image: postgres
     volumes:
       - db:/var/lib/postgresql/data
 
   app:
+    environment:
+      MAYAN_CELERY_BROKER_URL: redis://redis:6379/1
+      MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/0
+      MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'db'}}"
     image: mayanedms/mayanedms:latest
     ports:
       - 80:8000
-    environment:
-      MAYAN_DATABASE_ENGINE: django.db.backends.postgresql
-      MAYAN_DATABASE_HOST: db
-      MAYAN_DATABASE_NAME: mayan
-      MAYAN_DATABASE_PASSWORD: mayan-password
-      MAYAN_DATABASE_USER: mayan
-      MAYAN_DATABASE_CONN_MAX_AGE: 0
     volumes:
       - app:/var/lib/mayan
+
+  redis:
+    command:
+      - redis-server
+      - --databases
+      - "2"
+      - --maxmemory-policy
+      - allkeys-lru
+      - --save
+      - ""
+    image: redis:5.0

docs/chapters/deploying.rst

@@ -127,9 +127,8 @@ For another setup that offers more performance and scalability refer to the
 
    ::
 
-       sudo -u mayan MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-       MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-       MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
+       sudo -u mayan MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'127.0.0.1'}}" \
+       MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
        /opt/mayan-edms/bin/mayan-edms.py initialsetup
 
 
@@ -148,9 +147,8 @@ For another setup that offers more performance and scalability refer to the
 ------------------------------------------------------------------------
     ::
 
-        sudo MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-        MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-        MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
+        sudo mayan MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'127.0.0.1'}}" \
+        MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
         /opt/mayan-edms/bin/mayan-edms.py platformtemplate supervisord > /etc/supervisor/conf.d/mayan.conf
 
 
@@ -222,11 +220,11 @@ of a restart or power failure. The Gunicorn workers are increased to 3.
 ---------------------------------------------------------------------
    Replace (paying attention to the comma at the end)::
 
-       MAYAN_BROKER_URL="redis://127.0.0.1:6379/0",
+       MAYAN_CELERY_BROKER_URL="redis://127.0.0.1:6379/0",
 
    with::
 
-       MAYAN_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
+       MAYAN_CELERY_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
 
    increase the number of Gunicorn workers to 3 in the line (``-w 2`` section)::
 

docs/chapters/docker.rst

@@ -49,12 +49,7 @@ Finally create and run a Mayan EDMS container::
     --name mayan-edms \
     --restart=always \
     -p 80:8000 \
-    -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \
-    -e MAYAN_DATABASE_HOST=172.17.0.1 \
-    -e MAYAN_DATABASE_NAME=mayan \
-    -e MAYAN_DATABASE_PASSWORD=mayanuserpass \
-    -e MAYAN_DATABASE_USER=mayan \
-    -e MAYAN_DATABASE_CONN_MAX_AGE=0 \
+    -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'172.17.0.1'}}" \
     -v /docker-volumes/mayan-edms/media:/var/lib/mayan \
     mayanedms/mayanedms:<version>
 
@@ -108,12 +103,7 @@ instead of the IP address of the Docker host (``172.17.0.1``)::
     --network=mayan \
     --restart=always \
     -p 80:8000 \
-    -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \
-    -e MAYAN_DATABASE_HOST=mayan-edms-postgres \
-    -e MAYAN_DATABASE_NAME=mayan \
-    -e MAYAN_DATABASE_PASSWORD=mayanuserpass \
-    -e MAYAN_DATABASE_USER=mayan \
-    -e MAYAN_DATABASE_CONN_MAX_AGE=0 \
+    -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'mayan-edms-postgres'}}" \
     -v /docker-volumes/mayan-edms/media:/var/lib/mayan \
     mayanedms/mayanedms:<version>
 
@@ -137,102 +127,14 @@ To start the container again::
 Environment Variables
 ---------------------
 
-The Mayan EDMS image can be configure via environment variables.
-
-``MAYAN_DATABASE_ENGINE``
-
-Defaults to ``None``. This environment variable configures the database
-backend to use. If left unset, SQLite will be used. The database backends
-supported by this Docker image are:
-
-- ``'django.db.backends.postgresql'``
-- ``'django.db.backends.mysql'``
-- ``'django.db.backends.sqlite3'``
-
-When using the SQLite backend, the database file will be saved in the Docker
-volume. The SQLite database as used by Mayan EDMS is meant only for development
-or testing, never use it in production.
-
-``MAYAN_DATABASE_NAME``
-
-Defaults to 'mayan'. This optional environment variable can be used to define
-the database name that Mayan EDMS will connect to. For more information read
-the pertinent Django documentation page:
-:django-docs:`Connecting to the database <ref/databases/#connecting-to-the-database>`
-
-``MAYAN_DATABASE_USER``
-
-Defaults to 'mayan'. This optional environment variable is used to set the
-username that will be used to connect to the database. For more information
-read the pertinent Django documentation page:
-:django-docs:`Settings, USER <ref/settings/#user>`
-
-``MAYAN_DATABASE_PASSWORD``
-
-Defaults to ''. This optional environment variable is used to set the
-password that will be used to connect to the database. For more information
-read the pertinent Django documentation page:
-:django-docs:`Settings, PASSWORD <ref/settings/#password>`
-
-``MAYAN_DATABASE_HOST``
-
-Defaults to `None`. This optional environment variable is used to set the
-hostname that will be used to connect to the database. This can be the
-hostname of another container or an IP address. For more information read
-the pertinent Django documentation page:
-:django-docs:`Settings, HOST <ref/settings/#host>`
-
-``MAYAN_DATABASE_PORT``
-
-Defaults to `None`. This optional environment variable is used to set the
-port number to use when connecting to the database. An empty string means
-the default port. Not used with SQLite. For more information read the
-pertinent Django documentation page:
-:django-docs:`Settings, PORT <ref/settings/#port>`
-
-``MAYAN_BROKER_URL``
-
-This optional environment variable determines the broker that Celery will use
-to relay task messages between the frontend code and the background workers.
-For more information read the pertinent Celery Kombu documentation page: `Broker URL`_
-
-.. _Broker URL: http://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls
-
-This Docker image supports using Redis and RabbitMQ as brokers.
-
-Caveat: If the `MAYAN_BROKER_URL` and `MAYAN_CELERY_RESULT_BACKEND` environment
-variables are specified, the built-in Redis server inside the container will
-be disabled.
-
-``MAYAN_CELERY_RESULT_BACKEND``
-
-This optional environment variable determines the results backend that Celery
-will use to relay result messages from the background workers to the frontend
-code. For more information read the pertinent Celery Kombu documentation page:
-`Task result backend settings`_
-
-.. _Task result backend settings: http://docs.celeryproject.org/en/3.1/configuration.html#celery-result-backend
-
-This Docker image supports using Redis and RabbitMQ as result backends.
-
-Caveat: If the `MAYAN_BROKER_URL` and `MAYAN_CELERY_RESULT_BACKEND` environment
-variables are specified, the built-in Redis server inside the container will
-be disabled.
+The common set of settings can also be modified via environment variables when
+using the Docker image. In addition to the common set of settings, some Docker
+image specific environment variables are available.
 
 ``MAYAN_SETTINGS_MODULE``
 
 Optional. Allows loading an alternate settings file.
 
-``MAYAN_DATABASE_CONN_MAX_AGE``
-
-Amount in seconds to keep a database connection alive. Allow reuse of database
-connections. For more information read the pertinent Django documentation
-page: :django-docs:`Settings, CONN_MAX_AGE <ref/settings/#conn-max-age>`
-According to new information Gunicorn's microthreads don't share connections
-and will exhaust the available Postgres connections available if a number
-other than 0 is used. Reference: https://serverfault.com/questions/635100/django-conn-max-age-persists-connections-but-doesnt-reuse-them-with-postgresq
-and https://github.com/benoitc/gunicorn/issues/996
-
 ``MAYAN_GUNICORN_WORKERS``
 
 Optional. This environment variable controls the number of frontend workers
@@ -275,6 +177,15 @@ Optional. Changes the GID of the ``mayan`` user internal to the Docker
 container. Defaults to 1000.
 
 
+Included drivers
+----------------
+
+The Docker image supports using Redis and RabbitMQ as result backends. For
+databases, the image includes support for PostgreSQL and MySQL/MariaDB.
+Support for additional brokers or databases may be added using the
+``MAYAN_APT_INSTALL`` environment variable.
+
+
 .. _docker-accessing-outside-data:
 
 Accessing outside data
@@ -442,6 +353,7 @@ These are:
 
 Nightly images
 ==============
+
 The continuous integration pipeline used for testing development builds also
 produces a resulting Docker image. These are build automatically and their
 stability is not guaranteed. They should never be used in production.

docs/chapters/scaling_up.rst

@@ -94,11 +94,11 @@ For the Docker image, launch a separate RabbitMQ container
 
     docker run -d --name mayan-edms-rabbitmq -e RABBITMQ_DEFAULT_USER=mayan -e RABBITMQ_DEFAULT_PASS=mayanrabbitmqpassword -e RABBITMQ_DEFAULT_VHOST=mayan rabbitmq:3
 
-Pass the MAYAN_BROKER_URL environment variable (https://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls)
+Pass the MAYAN_CELERY_BROKER_URL environment variable (https://kombu.readthedocs.io/en/latest/userguide/connections.html#connection-urls)
 to the Mayan EDMS container so that it uses the RabbitMQ container the
 message broker::
 
-    -e MAYAN_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
+    -e MAYAN_CELERY_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan",
 
 When tasks finish, they leave behind a return status or the result of a
 calculation, these are stored for a while so that whoever requested the

docs/conf.py

@@ -22,9 +22,7 @@ import mayan
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(
-    os.path.abspath(os.path.join(os.path.dirname(__file__), '_ext'))
-)
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")))
 
 # -- General configuration -----------------------------------------------------
 
@@ -36,13 +34,12 @@ sys.path.append(
 #extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
 #extensions = ["djangodocs", "sphinx.ext.intersphinx"]
 extensions = [
-    'sphinx.ext.extlinks', 'sphinxcontrib.blockdiag',
-    'sphinxcontrib.spelling'
+    'sphinx.ext.extlinks', 'sphinxcontrib.blockdiag', 'sphinxcontrib.spelling'
 ]
 
 blockdiag_antialias = True
-blockdiag_html_image_format = 'SVG'
-blockdiag_latex_image_format = 'PDF'
+blockdiag_html_image_format = "SVG"
+blockdiag_latex_image_format = "PDF"
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -109,14 +106,12 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'classic'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    'analytics_id': 'UA-52965619-6',
-}
+#html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -144,7 +139,7 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -167,7 +162,7 @@ html_last_updated_fmt = '%b %d, %Y'
 #html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-html_show_sourcelink = False
+#html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #html_show_sphinx = True
@@ -186,6 +181,8 @@ html_show_sourcelink = False
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'MayanEDMSdoc'
 
+html_show_sourcelink = False
+
 html_show_sphinx = False
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -236,6 +233,8 @@ man_pages = [
      [mayan.__author__], 1)
 ]
 
+html_theme = 'sphinx_rtd_theme'
+
 # -- External links --
 extlinks = {
     'django-docs': (
@@ -243,9 +242,6 @@ extlinks = {
             mayan.__django_version__
         ), 'Django documentation section: '
     ),
-    'forum-topic': (
-        'https://forum.mayan-edms.com/viewtopic.php?t=%s', 'Forum topic #'
-    ),
     'github-issue': (
         'https://github.com/mayan-edms/mayan-edms/issues/%s', 'GitHub issue #'
     ),
@@ -254,6 +250,5 @@ extlinks = {
     )
 }
 
-
 def setup(app):
     app.add_stylesheet('css/custom.css')

docs/releases/3.2.3.rst

@@ -19,7 +19,6 @@ Changes
   GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
   for the report and the research.
 
-
 Removals
 --------
 

docs/releases/3.2.7.rst

@@ -1,145 +0,0 @@
-Version 3.2.7
-=============
-
-Released: August 28, 2019
-
-
-Changes
--------
-
-- Fix checkouts form bug. Fixes GitLab issue #654
-  Thanks to Lucius Schaerer (@lschaer1) for the report.
-- Disable pagination current page button
-  Current page button was clickable and would cause the
-  single page navigation to jump to the home view.
-- Remove redundant Celery queue declarations from the
-  file_metadata app.
-- Add internal_name field to workflow serializer.
-  Fixes workflow API creation view.
-- Fix document cabinet list API view. Thanks for forum user
-  "jere" for the report. Forum topic 1039.
-- Fix document template column field. GitLab issue #655.
-  Thanks to Christian Wiegand (@christianwgd) for the
-  report.
-- Increase mailing profile password field max length
-  from 48 to 128 characters. GitLab issue #657.
-  Thanks to sigsec (@sigsec) for the report.
-- Update the Docker entrypoint to update the ownership
-  of files when the UID of GUID are changed.
-  GitLab issue #650. Thanks to Fabian (@ruffy91)
-  for the report.
-- Update the Docker entrypoint to allow changing
-  the GID of the mayan user to existing values.
-  GitLab issue #652. Thanks to Fabian (@ruffy91)
-  for the report.
-- Rename the MAYAN_USER_GUID environment variable
-  to MAYAN_USER_GID.
-- Backport individual index rebuild support.
-- Add automatic adjustment of HTML body on navigation
-  bar changes. Closes GitLab issue #643. Thanks to
-  Light Templar (@LightTemplar) for the report.
-- Unify all line endings to be Linux style.
-- Make sure system alerts don't appear under
-  floating elements.
-
-Removals
---------
-
-- None
-
-
-Upgrading from a previous version
----------------------------------
-
-If installed via Python's PIP
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Remove deprecated requirements::
-
-    sudo -u mayan curl https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt -o /tmp/removals.txt && sudo -u mayan /opt/mayan-edms/bin/pip uninstall -y -r /tmp/removals.txt
-
-Type in the console::
-
-    sudo -u mayan /opt/mayan-edms/bin/pip install mayan-edms==3.2.7
-
-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.
-
-Remove deprecated requirements::
-
-    $ pip uninstall -y -r removals.txt
-
-Next upgrade/add the new requirements::
-
-    $ pip install --upgrade -r requirements.txt
-
-
-Common steps
-^^^^^^^^^^^^
-
-Perform these steps after updating the code from either step above.
-
-Make a backup of your supervisord file::
-
-    sudo cp /etc/supervisor/conf.d/mayan.conf /etc/supervisor/conf.d/mayan.conf.bck
-
-Update the supervisord configuration file. Replace the environment
-variables values show here with your respective settings. This step will refresh
-the supervisord configuration file with the new queues and the latest
-recommended layout::
-
-    sudo MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-    MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-    MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py platformtemplate supervisord > /etc/supervisor/conf.d/mayan.conf
-
-Edit the supervisord configuration file and update any setting the template
-generator missed::
-
-    sudo vi /etc/supervisor/conf.d/mayan.conf
-
-Migrate existing database schema with::
-
-    sudo -u mayan MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \
-    MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \
-    MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py performupgrade
-
-Add new static media::
-
-    sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
-
-The upgrade procedure is now complete.
-
-
-Backward incompatible changes
------------------------------
-
-- None
-
-
-Bugs fixed or issues closed
----------------------------
-
-- :gitlab-issue:`643` The "Actions" button won't show up, if window size between 992 and 1248 px
-- :gitlab-issue:`650` Permission denied when MAYAN_USER_UID and MAYAN_USER_GUID are set
-- :gitlab-issue:`652` MAYAN_USER_GUID cannot be set to specific values
-- :gitlab-issue:`654` Internal Server Error, Document Checkout
-- :gitlab-issue:`655` Index setup tree view shows two times the "enabled" field instead of "Link documents"
-- :gitlab-issue:`657` Mailer password length restriction is too short
-- :forum-topic:`1039` Re: /api/documents/{id}/cabinets returns 500
-- :forum-topic:`1050` edit/delete sub-cabinet
-
-.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/3.3.rst

@@ -0,0 +1,207 @@
+Version 3.3
+===========
+
+Released: XX XX, 2019
+
+
+Changes
+-------
+
+- Add support for icon shadows.
+- Add icons and no-result template to the object error log view and
+  links.
+- Use Select2 widget for the document type selection form.
+- Backport the vertical main menu update. This update splits the previous
+  main menu into a new menu in the same location as the previous one
+  now called the top bar, and a new vertical main menu on the left side.
+  The vertical menu remain open even when clicking on items and upon
+  a browser refresh will also restore its state to match the selected
+  view.
+- Backport workflow preview refactor. GitLab issue #532.
+- Add support for source column inheritance.
+- Add support for source column exclusion.
+- Backport workflow context support.
+- Backport workflow transitions field support.
+- Backport workflow email action.
+- Backport individual index rebuild support.
+- Rename the installjavascript command to installdependencies.
+- Remove database conversion command.
+- Remove support for quoted configuration entries. Support unquoted,
+  nested dictionaries in the configuration. Requires manual
+  update of existing config.yml files.
+- Support user specified locations for the configuration file with the
+  CONFIGURATION_FILEPATH (MAYAN_CONFIGURATION_FILEPATH environment variable), and
+  CONFIGURATION_LAST_GOOD_FILEPATH
+  (MAYAN_CONFIGURATION_LAST_GOOD_FILEPATH environment variable) settings.
+- Move bootstrapped settings code to their own module in the smart_settings apps.
+- Remove individual database configuration options. All database configuration
+  is now done using MAYAN_DATABASES to mirror Django way of doing database setup.
+- Added support for YAML encoded environment variables to the platform
+  templates apps.
+- Move YAML code to its own module. Code now resides in common.serialization
+  in the form of two new functions: yaml_load and yaml_dump.
+- Move Django and Celery settings. Django settings now reside in the smart
+  settings app. Celery settings now reside in the task manager app.
+- Backport FakeStorageSubclass from versions/next. Placeholder class to allow
+  serializing the real storage subclass to support migrations.
+  Used by all configurable storages.
+- Support checking in and out multiple documents.
+- Remove encapsulate helper.
+- Add support for menu inheritance.
+- Emphasize source column labels.
+- Backport file cache manager app.
+- Convert document image cache to use file cache manager app.
+  Add setting DOCUMENTS_CACHE_MAXIMUM_SIZE defaults to 500 MB.
+- Update Celery to version 4.3.0. Settings changed:
+  MAYAN_BROKER_URL to MAYAN_CELERY_BROKER_URL,
+  MAYAN_CELERY_ALWAYS_EAGER to MAYAN_CELERY_TASK_ALWAYS_EAGER.
+- Replace djcelery and replace it with django-celery-beat.
+- Update Celery to version 4.3.0 with 55e9b2263cbdb9b449361412fd18d8ee0a442dd3
+  from versions/next, code from GitLab issue #594 and GitLab merge request !55.
+  Thanks to Jakob Haufe (@sur5r) and Jesaja Everling (@jeverling)
+  for much of the research and code updates.
+- Support wildcard MIME type associations for the file metadata drivers.
+- Rename MAYAN_GUID to MAYAN_GID
+- Update Gunicorn to use sync workers.
+- Include devpi-server as a development dependency.
+- Update default Docker stack file.
+- Remove Redis from the Docker image.
+- Add Celery flower to the Docker image.
+- Allow PIP proxying to the Docker image during build.
+- Default Celery worker concurrency to 0 (auto).
+- Set DJANGO_SETTINGS_MODULE environment variable to make it
+  available to sub processes.
+- Add entrypoint commands to run single workers, single gunicorn
+  or single celery commands like "flower".
+- Add platform template to return queues for a worker.
+- Remove task inspection from task manager app.
+- Move pagination navigation inside the toolbar.
+- Remove document image clear link and view.
+  This is now handled by the file caching app.
+- Add web links app.
+- Add support to display column help text
+  as a tooltip.
+- Update numeric dashboard widget to display
+  thousand commas.
+- Add support for disabling document pages.
+
+Removals
+--------
+
+- Database conversion. Reason for removal. The database conversions support
+  provided by this feature (SQLite to PostgreSQL) was being confused with
+  database migrations and upgrades.
+
+  Database upgrades are the responsibility of the app and the framework.
+  Database conversions however are not the responsibility of the app (Mayan),
+  they are the responsibility of the framework.
+
+  Database conversion is outside the scope of what Mayan does but we added
+  the code, management command, instructions and testing setup to provide
+  this to our users until the framework (Django) decided to add this
+  themselves (like they did with migrations).
+
+  Continued confusion about the purpose of the feature and confusion about
+  how errors with this feature were a reflexion of the code quality of
+  Mayannecessitated the removal of the database conversion feature.
+
+- Django environ
+
+
+Upgrading from a previous version
+---------------------------------
+
+If installed via Python's PIP
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Remove deprecated requirements::
+
+    sudo -u mayan curl https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt -o /tmp/removals.txt && sudo -u mayan /opt/mayan-edms/bin/pip uninstall -y -r /tmp/removals.txt
+
+Type in the console::
+
+    /opt/mayan-edms/bin/pip install mayan-edms==3.3
+
+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.
+
+Remove deprecated requirements::
+
+    pip uninstall -y -r removals.txt
+
+Next upgrade/add the new requirements::
+
+    pip install --upgrade -r requirements.txt
+
+
+Common steps
+^^^^^^^^^^^^
+
+Perform these steps after updating the code from either step above.
+
+Make a backup of your supervisord file::
+
+    sudo cp /etc/supervisor/conf.d/mayan.conf /etc/supervisor/conf.d/mayan.conf.bck
+
+Update the supervisord configuration file. Replace the environment
+variables values show here with your respective settings. This step will refresh
+the supervisord configuration file with the new queues and the latest
+recommended layout::
+
+    sudo MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'127.0.0.1'}}" \
+    MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
+    /opt/mayan-edms/bin/mayan-edms.py platformtemplate supervisord > /etc/supervisor/conf.d/mayan.conf
+
+Edit the supervisord configuration file and update any setting the template
+generator missed::
+
+    sudo vi /etc/supervisor/conf.d/mayan.conf
+
+Migrate existing database schema with::
+
+    sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media /opt/mayan-edms/bin/mayan-edms.py performupgrade
+
+Add new static media::
+
+    sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+-----------------------------
+
+- Update quoted settings to be unquoted:
+
+  - COMMON_SHARED_STORAGE_ARGUMENTS
+  - CONVERTER_GRAPHICS_BACKEND_ARGUMENTS
+  - DOCUMENTS_CACHE_STORAGE_BACKEND_ARGUMENTS
+  - DOCUMENTS_STORAGE_BACKEND_ARGUMENTS
+  - FILE_METADATA_DRIVERS_ARGUMENTS
+  - SIGNATURES_STORAGE_BACKEND_ARGUMENTS
+
+
+Bugs fixed or issues closed
+---------------------------
+
+- :gitlab-issue:`526` RuntimeWarning: Never call result.get() within a task!
+- :gitlab-issue:`532` Workflow preview isn't updated right after transitions are modified
+- :gitlab-issue:`540` hint-outdated/update documentation
+- :gitlab-issue:`594` 3.2b1: Unable to install/run under Python 3.5/3.6/3.7
+- :gitlab-issue:`634` Failing docker entrypoint when using secret config
+- :gitlab-issue:`635` Build a docker image for Python3
+- :gitlab-issue:`644` Update sane-utils package in docker image.
+
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/index.rst

@@ -20,7 +20,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
-   3.2.7
+   3.3
    3.2.6
    3.2.5
    3.2.4

mayan/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
-__version__ = '3.2.7'
-__build__ = 0x030207
-__build_string__ = 'v3.2.7_Wed Aug 28 17:31:08 2019 -0400'
+__version__ = '3.2.6'
+__build__ = 0x030206
+__build_string__ = 'v3.2.6-68-gab601f9180_Wed Jul 17 04:30:11 2019 -0400'
 __django_version__ = '1.11'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'

mayan/apps/acls/classes.py

@@ -12,6 +12,7 @@ logger = logging.getLogger(__name__)
 class ModelPermission(object):
     _functions = {}
     _inheritances = {}
+    _manager_names = {}
     _registry = {}
 
     @classmethod
@@ -97,6 +98,24 @@ class ModelPermission(object):
     def get_inheritance(cls, model):
         return cls._inheritances[model]
 
+    @classmethod
+    def get_manager(cls, model):
+        try:
+            manager_name = cls.get_manager_name(model=model)
+        except KeyError:
+            manager_name = None
+
+        if manager_name:
+            manager = getattr(model, manager_name)
+        else:
+            manager = model._meta.default_manager
+
+        return manager
+
+    @classmethod
+    def get_manager_name(cls, model):
+        return cls._manager_names[model]
+
     @classmethod
     def register_function(cls, model, function):
         cls._functions[model] = function
@@ -104,3 +123,7 @@ class ModelPermission(object):
     @classmethod
     def register_inheritance(cls, model, related):
         cls._inheritances[model] = related
+
+    @classmethod
+    def register_manager(cls, model, manager_name):
+        cls._manager_names[model] = manager_name

mayan/apps/acls/locale/ar/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"

mayan/apps/acls/locale/bg/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"

mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"

mayan/apps/acls/locale/cs/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Czech (http://www.transifex.com/rosarior/mayan-edms/language/cs/)\n"

mayan/apps/acls/locale/da_DK/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (Denmark) (http://www.transifex.com/rosarior/mayan-edms/language/da_DK/)\n"

mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"

mayan/apps/acls/locale/el/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Greek (http://www.transifex.com/rosarior/mayan-edms/language/el/)\n"

mayan/apps/acls/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

mayan/apps/acls/locale/es/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:51+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"

mayan/apps/acls/locale/fa/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"

mayan/apps/acls/locale/fr/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"

mayan/apps/acls/locale/hu/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"

mayan/apps/acls/locale/id/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"

mayan/apps/acls/locale/it/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-08-28 11:33+0000\n"
-"Last-Translator: Daniele Bortoluzzi <daniele@elkos.it>\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-06-15 07:48+0000\n"
+"Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -198,8 +198,8 @@ msgstr "Revoca accesso"
 
 #: workflow_actions.py:175
 msgid "Grant document access"
-msgstr "Concedi accesso al documento"
+msgstr ""
 
 #: workflow_actions.py:214
 msgid "Revoke document access"
-msgstr "Revoca accesso al documento"
+msgstr ""

mayan/apps/acls/locale/lv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-28 11:16+0000\n"
 "Last-Translator: Māris Teivāns <maris.teivans@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/rosarior/mayan-edms/language/lv/)\n"

mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"

mayan/apps/acls/locale/pl/LC_MESSAGES/django.po

@@ -4,16 +4,15 @@
 # 
 # Translators:
 # Daniel Winiarski <daniel.winiarski.dw@gmail.com>, 2017
-# Marcin Lozynski <mlozynski@wp.pl>, 2019
 # Wojciech Warczakowski <w.warczakowski@gmail.com>, 2016
 # Wojciech Warczakowski <w.warczakowski@gmail.com>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-08-30 21:41+0000\n"
-"Last-Translator: Marcin Lozynski <mlozynski@wp.pl>\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-06-15 07:48+0000\n"
+"Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +30,11 @@ msgstr "Listy ACL"
 
 #: events.py:12
 msgid "ACL created"
-msgstr "Utworzono listę ACL"
+msgstr ""
 
 #: events.py:15
 msgid "ACL edited"
-msgstr "Wyedytowano listę ACL"
+msgstr ""
 
 #: forms.py:15 models.py:49
 msgid "Role"
@@ -126,13 +125,13 @@ msgstr "Usuń listę ACL: %s"
 
 #: views.py:147
 msgid "There are no ACLs for this object"
-msgstr "Brak listy ACL dla tego objektu"
+msgstr ""
 
 #: views.py:150
 msgid ""
 "ACL stands for Access Control List and is a precise method  to control user "
 "access to objects in the system."
-msgstr "Lista ACL stanowi metodę kontroli dostępu użytkownika do obiektów znajdujących się w systemie."
+msgstr ""
 
 #: views.py:154
 #, python-format
@@ -150,7 +149,7 @@ msgstr "Dostępne uprawnienia"
 #: views.py:215
 #, python-format
 msgid "Role \"%(role)s\" permission's for \"%(object)s\"."
-msgstr "Rola \"%(role)s\" uprawnienia dla \"%(object)s\"."
+msgstr ""
 
 #: views.py:224
 msgid ""
@@ -192,16 +191,16 @@ msgstr "Uprawnienia do nadawania/odwoływania do/z roli dla obiektu."
 
 #: workflow_actions.py:60
 msgid "Grant access"
-msgstr "Przydziel dostęp"
+msgstr "Przyznaj dostęp"
 
 #: workflow_actions.py:143
 msgid "Revoke access"
-msgstr "Zabierz dostęp"
+msgstr "Odwołaj dostęp"
 
 #: workflow_actions.py:175
 msgid "Grant document access"
-msgstr "Przydziel dostęp dla dokumentu"
+msgstr ""
 
 #: workflow_actions.py:214
 msgid "Revoke document access"
-msgstr "Zabierz dostęp do dokumentu"
+msgstr ""

mayan/apps/acls/locale/pt/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"

mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"

mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-18 15:35+0000\n"
 "Last-Translator: Harald Ersch\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-edms/language/ro_RO/)\n"

mayan/apps/acls/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/language/ru/)\n"

mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-edms/language/sl_SI/)\n"

mayan/apps/acls/locale/tr_TR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/rosarior/mayan-edms/language/tr_TR/)\n"

mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/mayan-edms/language/vi_VN/)\n"

mayan/apps/acls/locale/zh/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: 2019-06-15 07:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (http://www.transifex.com/rosarior/mayan-edms/language/zh/)\n"

mayan/apps/acls/managers.py

@@ -200,28 +200,26 @@ class AccessControlListManager(models.Manager):
 
         return result
 
-    def check_access(self, obj, permissions, user, manager=None):
+    def check_access(self, obj, permissions, user):
         # Allow specific managers for models that have more than one
         # for example the Document model when checking for access for a trashed
         # document.
 
-        if manager:
-            source_queryset = manager.all()
+        meta = getattr(obj, '_meta', None)
+
+        if not meta:
+            logger.debug(
+                ugettext(
+                    'Object "%s" is not a model and cannot be checked for '
+                    'access.'
+                ) % force_text(obj)
+            )
+            return True
         else:
-            meta = getattr(obj, '_meta', None)
+            manager = ModelPermission.get_manager(model=obj._meta.model)
+            source_queryset = manager.all()
 
-            if not meta:
-                logger.debug(
-                    ugettext(
-                        'Object "%s" is not a model and cannot be checked for '
-                        'access.'
-                    ) % force_text(obj)
-                )
-                return True
-            else:
-                source_queryset = obj._meta.default_manager.all()
-
-        restricted_queryset = obj._meta.default_manager.none()
+        restricted_queryset = manager.none()
         for permission in permissions:
             # Default relationship betweens permissions is OR
             # TODO: Add support for AND relationship

mayan/apps/appearance/classes.py

@@ -4,6 +4,7 @@ from django.template.loader import get_template
 
 
 class IconDriver(object):
+    context = {}
     _registry = {}
 
     @classmethod
@@ -14,6 +15,17 @@ class IconDriver(object):
     def register(cls, driver_class):
         cls._registry[driver_class.name] = driver_class
 
+    def get_context(self):
+        return self.context
+
+    def render(self, extra_context=None):
+        context = self.get_context()
+        if extra_context:
+            context.update(extra_context)
+        return get_template(template_name=self.template_name).render(
+            context=context
+        )
+
 
 class FontAwesomeDriver(IconDriver):
     name = 'fontawesome'
@@ -22,10 +34,8 @@ class FontAwesomeDriver(IconDriver):
     def __init__(self, symbol):
         self.symbol = symbol
 
-    def render(self):
-        return get_template(template_name=self.template_name).render(
-            context={'symbol': self.symbol}
-        )
+    def get_context(self):
+        return {'symbol': self.symbol}
 
 
 class FontAwesomeDualDriver(IconDriver):
@@ -36,23 +46,21 @@ class FontAwesomeDualDriver(IconDriver):
         self.primary_symbol = primary_symbol
         self.secondary_symbol = secondary_symbol
 
-    def render(self):
-        return get_template(template_name=self.template_name).render(
-            context={
-                'data': (
-                    {
-                        'class': 'fas fa-circle',
-                        'transform': 'down-3 right-10',
-                        'mask': 'fas fa-{}'.format(self.primary_symbol)
-                    },
-                    {'class': 'far fa-circle', 'transform': 'down-3 right-10'},
-                    {
-                        'class': 'fas fa-{}'.format(self.secondary_symbol),
-                        'transform': 'shrink-4 down-3 right-10'
-                    },
-                )
-            }
-        )
+    def get_context(self):
+        return {
+            'data': (
+                {
+                    'class': 'fas fa-circle',
+                    'transform': 'down-3 right-10',
+                    'mask': 'fas fa-{}'.format(self.primary_symbol)
+                },
+                {'class': 'far fa-circle', 'transform': 'down-3 right-10'},
+                {
+                    'class': 'fas fa-{}'.format(self.secondary_symbol),
+                    'transform': 'shrink-4 down-3 right-10'
+                },
+            )
+        }
 
 
 class FontAwesomeCSSDriver(IconDriver):
@@ -62,10 +70,8 @@ class FontAwesomeCSSDriver(IconDriver):
     def __init__(self, css_classes):
         self.css_classes = css_classes
 
-    def render(self):
-        return get_template(template_name=self.template_name).render(
-            context={'css_classes': self.css_classes}
-        )
+    def get_context(self):
+        return {'css_classes': self.css_classes}
 
 
 class FontAwesomeMasksDriver(IconDriver):
@@ -75,23 +81,23 @@ class FontAwesomeMasksDriver(IconDriver):
     def __init__(self, data):
         self.data = data
 
-    def render(self):
-        return get_template(template_name=self.template_name).render(
-            context={'data': self.data}
-        )
+    def get_context(self):
+        return {'data': self.data}
 
 
 class FontAwesomeLayersDriver(IconDriver):
     name = 'fontawesome-layers'
     template_name = 'appearance/icons/font_awesome_layers.html'
 
-    def __init__(self, data):
+    def __init__(self, data, shadow_class=None):
         self.data = data
+        self.shadow_class = shadow_class
 
-    def render(self):
-        return get_template(template_name=self.template_name).render(
-            context={'data': self.data}
-        )
+    def get_context(self):
+        return {
+            'data': self.data,
+            'shadow_class': self.shadow_class,
+        }
 
 
 class Icon(object):

mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "لم يتم العثور على الصفحة"
 msgid "Sorry, but the requested page could not be found."
 msgstr "عفواً، لا يمكن العثور على الصفحة المطلوبة."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "الإجراءات"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Страницата не е намерена"
 msgid "Sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Действия"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Stranica nije pronađena"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Žao nam je, ali tražena stranica ne može biti pronađena."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Greška u serveru"
 
@@ -153,26 +153,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Akcije"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Toggle Dropdown"
@@ -293,15 +278,15 @@ msgstr "Prebacite navigaciju"
 msgid "No results"
 msgstr "Nema rezultata"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Zatvori"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Problem u komunikaciji sa serverom"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Proverite mrežnu vezu i pokušajte ponovo za nekoliko trenutaka."
 

mayan/apps/appearance/locale/cs/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Czech (http://www.transifex.com/rosarior/mayan-edms/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr ""
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/da_DK/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (Denmark) (http://www.transifex.com/rosarior/mayan-edms/language/da_DK/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Side ikke fundet"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Beklager, men den ønskede side kunne ikke findes"
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Server fejl"
 
@@ -153,26 +153,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Advarelse"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr ""
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -293,15 +278,15 @@ msgstr ""
 msgid "No results"
 msgstr "Ingen resultater"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Luk"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "Seite nicht gefunden"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Die angeforderte Seite konnte leider nicht gefunden werden"
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Serverfehler"
 
@@ -156,26 +156,11 @@ msgstr "\nWenn Sie %(project_title)s verwenden, erwägen Sie bitte <a class=\"ne
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\nEine umfassende Liste der Neuerungen ist einsehbar in den <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release Notes %(icon_documentation)s oder als Kurzversion<a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">im Changelog %(icon_documentation)s</a>."
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -183,7 +168,7 @@ msgid ""
 "            "
 msgstr "\nBei Fragen schauen Sie zunächst in die <a class=\"new_window\" href=\"https://docs.mayan-edms.com\"> Dokumentation %(icon_documentation)s</a> oder die <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\"> Wiki %(icon_wiki)s</a>."
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -191,7 +176,7 @@ msgid ""
 "            "
 msgstr "\nSollten Sie einen Bug gefunden oder eine Idee für eine neue Funktion haben, dann besuchen Sie entweder das<a class=\"new_window\" href=\"https://forum.mayan-edms.com\"> Forum %(icon_forum)s</a> oder erstellen Sie ein Ticket in der <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\"> Quellenverwaltung %(icon_source_code)s</a>. "
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -200,22 +185,22 @@ msgid ""
 "            "
 msgstr "\nMachen Sie dieses Projekt bekannt. Berichten Sie Ihren Freunden und Kollegen, wie angenehm die Arbeit mit %(project_title)s ist!\n Folgen Sie uns auf <a class=\"new_window\" href=\"https://twitter.com/mayanedms\">Twitter %(icon_social_twitter)s</a>, <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\">Facebook %(icon_social_facebook)s</a>, oder <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\">Instagram %(icon_social_instagram)s</a>\n            "
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Warnung"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Ausklappmenü ein-/ausschalten"
@@ -296,15 +281,15 @@ msgstr "Navigation ein-/ausschalten"
 msgid "No results"
 msgstr "Kein Ergebnis"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Fehler bei der Verbindung zum Server"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Prüfen Sie Ihre Netzwerkeinstellungen und versuchen Sie es nochmals."
 

mayan/apps/appearance/locale/el/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Greek (http://www.transifex.com/rosarior/mayan-edms/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Η σελίδα δεν βρέθηκε"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Λυπάμαι, η ζητούμενη σελίδα δεν βρέθηκε."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Σφάλμα διακομηστή"
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr "Εναλλαγή πλοήγησης"
 msgid "No results"
 msgstr "Κανένα αποτέλεσμα"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -158,26 +158,6 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www."
-"paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and "
-"lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a "
-"class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy "
-"of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is "
-"available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class="
 "\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html"
 "\">Release notes %(icon_documentation)s</a> or the short version <a class="
@@ -186,7 +166,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -197,7 +177,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -209,7 +189,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -223,22 +203,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr ""
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -319,15 +299,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/es/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 06:49+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Página no encontrada"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Lo sentimos, pero no se pudo encontrar la página solicitada."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Error de servidor"
 
@@ -153,26 +153,11 @@ msgstr "\n                Si usa %(project_title)s por favor <a
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\n                La lista completa de cambios está disponible a través de <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\"> Notas de la versión %(icon_documentation)s </a> o la versión corta <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\"> Changelog %(icon_documentation)s </a>.\n            "
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr "\n                Para preguntas, consulte la <a class=\"new_window\" href=\"https://docs.mayan-edms.com\"> Documentación %(icon_documentation)s </a> o <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\"> el Wiki %(icon_wiki)s </a>.\n            "
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr "\n                Si encontró un error o tiene una idea característica, visite el <a class=\"new_window\" href=\"https://forum.mayan-edms.com\"> Forum %(icon_forum)s </a> o abra un ticket en el <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\"> Repositorio de código fuente %(icon_source_code)s </a>\n            "
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr "\n                Riega la voz. ¡Habla con tus amigos y colegas sobre lo increíble que es %(project_title)s!\n                Síguenos en <a class=\"new_window\" href=\"https://twitter.com/mayanedms\"> Twitter %(icon_social_twitter)s </a>, <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\"> Facebook %(icon_social_facebook)s </a> o <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\"> Instagram %(icon_social_instagram)s </a>\n            "
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Advertencia"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr "Configuraciones actualizadas, reinicie su instalación para que los cambios tengas efecto."
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Acciones"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Alternar desplegable"
@@ -293,15 +278,15 @@ msgstr "Activar/Desactivar navegación"
 msgid "No results"
 msgstr "Ningún resultado"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Cerrar"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Error de comunicación del servidor"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Verifique su conexión de red y vuelva a intentarlo en unos momentos."
 

mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "صفحه پیدا نشد."
 msgid "Sorry, but the requested page could not be found."
 msgstr "متاسفانه صفحه درخواستی پیدا نشد."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "خطای سرور"
 
@@ -153,26 +153,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "عملیات"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "تغییر وضعیت dropdown"
@@ -293,15 +278,15 @@ msgstr "تغییر ناوبری"
 msgid "No results"
 msgstr "بی جواب و یا بی جواب"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "Page non trouvée"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Désolé, la page demandée n'a pu être trouvée."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Erreur du serveur"
 
@@ -158,26 +158,11 @@ msgstr "\n                Si vous utilisez %(project_title)s s'il vous plaît <a
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\n                La liste complète des changements est disponible dans les <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">notes de publication %(icon_documentation)s</a> ou en version courte dans le <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">journal des modifications %(icon_documentation)s</a>.\n            "
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -185,7 +170,7 @@ msgid ""
 "            "
 msgstr "\n                Pour trouver des réponses à vos questions consultez la <a class=\"new_window\" href=\"https://docs.mayan-edms.com\">documentation %(icon_documentation)s</a> ou le <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\">wiki %(icon_wiki)s</a>.\n            "
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -193,7 +178,7 @@ msgid ""
 "            "
 msgstr "\n                Si vous avez trouvé un bogue ou une idée pour une nouvelle fonctionnalité, visitez le <a class=\"new_window\" href=\"https://forum.mayan-edms.com\">forum %(icon_forum)s</a> ou soumettez un nouveau billet dans le <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\">dépôt de code source %(icon_source_code)s</a>.\n            "
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -202,22 +187,22 @@ msgid ""
 "            "
 msgstr "\n                Faites passer le mot. Parlez à vos amis et vos collègues de comment %(project_title)s est génial!\n                Suivez-nous sur <a class=\"new_window\" href=\"https://twitter.com/mayanedms\">Twitter %(icon_social_twitter)s</a>, <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\">Facebook %(icon_social_facebook)s</a> ou <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\">Instagram %(icon_social_instagram)s</a>\n            "
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Avertissement"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
-msgstr "Les paramètres ont été mis à jour, redémarrez votre installation pour que les modifications prennent effet."
+msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Activer la liste déroulante"
@@ -298,15 +283,15 @@ msgstr "Activer la navigation"
 msgid "No results"
 msgstr "Pas de résultats"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Erreur de communication serveur"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Vérifiez votre connexion réseau et réessayez dans quelques instants."
 

mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Oldal nem található"
 msgid "Sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -153,26 +153,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Műveletek"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -293,15 +278,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/id/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Aksi"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/it/LC_MESSAGES/django.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "Pagina non trovata"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Scusa ma la pagina richiesta non è disponibile"
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Errore del server"
 
@@ -155,26 +155,11 @@ msgstr "\nSe usi %(project_title)s puoi <a class=\"new_window\" href=\"https://w
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\nLa lista completa dei cambiamenti è disponibile nelle <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Note di rilascio %(icon_documentation)s</a> o in versione più breve nel <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>."
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -182,7 +167,7 @@ msgid ""
 "            "
 msgstr "\nPer dubbi o domande guarda la <a class=\"new_window\" href=\"https://docs.mayan-edms.com\">documentazione %(icon_documentation)s</a> o il <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\">Wiki %(icon_wiki)s</a>."
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -190,7 +175,7 @@ msgid ""
 "            "
 msgstr "\nSe trovi un bug o hai un'idea per una nuova funzionalità, visita il <a class=\"new_window\" href=\"https://forum.mayan-edms.com\">Forum %(icon_forum)s</a> o apri un ticket nel <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\">repository del codice %(icon_source_code)s</a>."
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -199,22 +184,22 @@ msgid ""
 "            "
 msgstr "\nDiffondi il verbo. Dillo ai tuoi amici e colleghi quanto è bello %(project_title)s!\nSeguici su <a class=\"new_window\" href=\"https://twitter.com/mayanedms\">Twitter %(icon_social_twitter)s</a>,  <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\">Facebook %(icon_social_facebook)s</a> o <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\">Instagram %(icon_social_instagram)s</a>"
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Attenzione"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Azioni "
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Apri dropdown"
@@ -295,15 +280,15 @@ msgstr "Cambia navigazione"
 msgid "No results"
 msgstr "Nessun risultato"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Errore di comunicazione del Server"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Controlla la connessione di rete e riprova"
 

mayan/apps/appearance/locale/lv/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Latvian (http://www.transifex.com/rosarior/mayan-edms/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Lapa nav atrasta"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Diemžēl pieprasīto lapu nevarēja atrast."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Servera kļūda"
 
@@ -153,26 +153,11 @@ msgstr "\nJa izmantojat %(project_title)s, lūdzu, <a class=\"new_window\" href=
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\nPilns izmaiņu saraksts ir pieejams, skatot <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> vai īso versiju <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a> ."
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -180,7 +165,7 @@ msgid ""
 "            "
 msgstr "\nJautājumu gadījumā pārbaudiet <a class=\"new_window\" href=\"https://docs.mayan-edms.com\">dokumentāciju %(icon_documentation)s</a> vai <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\">Wiki %(icon_wiki)s</a> ."
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -188,7 +173,7 @@ msgid ""
 "            "
 msgstr "\nJa atradāt kļūdu vai ir kāda funkcionalitātes ideja, apmeklējiet <a class=\"new_window\" href=\"https://forum.mayan-edms.com\">forumu %(icon_forum)s</a> vai atveriet biļeti <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\">pirmkoda repozitorijā %(icon_source_code)s</a> ."
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -197,22 +182,22 @@ msgid ""
 "            "
 msgstr "\nIzplatiet vārdu. Runājiet ar saviem draugiem un kolēģiem par to, cik lielisks %(project_title)s ir! Sekojiet mums <a class=\"new_window\" href=\"https://twitter.com/mayanedms\">Twitter %(icon_social_twitter)s</a> , <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\">Facebook %(icon_social_facebook)s</a> vai <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\">Instagram %(icon_social_instagram)s</a>"
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Darbības"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Toggle Dropdown"
@@ -293,15 +278,15 @@ msgstr "Pārslēgt navigāciju"
 msgid "No results"
 msgstr "Nav rezultātu"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Aizvērt"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Servera sakaru kļūda"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Pārbaudiet tīkla savienojumu un pēc brīža mēģiniet vēlreiz."
 

mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "Pagina niet gevonden"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Excuses, maar de opgevraagde pagina kan niet worden gevonden."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Server fout"
 
@@ -155,26 +155,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -182,7 +167,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -190,7 +175,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -199,22 +184,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Acties"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Toggle Dropdown"
@@ -295,15 +280,15 @@ msgstr "Toggle navigatie"
 msgid "No results"
 msgstr "Geen resultaten"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Sluiten"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Server communicatie probleem"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Controleer uw netwerkverbinding en probeer nog eens een beetje later."
 

mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po

@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marcin Lozynski <mlozynski@wp.pl>, 2019
 # Wojciech Warczakowski <w.warczakowski@gmail.com>, 2016,2018
 # Wojciech Warczakowski <w.warczakowski@gmail.com>, 2017
 # Wojciech Warczakowski <w.warczakowski@gmail.com>, 2016
@@ -11,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -47,11 +46,11 @@ msgstr ""
 
 #: dependencies.py:40
 msgid "jQuery"
-msgstr "jQuery"
+msgstr ""
 
 #: dependencies.py:43
 msgid "JQuery Form"
-msgstr "Formularz JQuery"
+msgstr ""
 
 #: dependencies.py:47
 msgid "jQuery Lazy Load"
@@ -63,7 +62,7 @@ msgstr ""
 
 #: dependencies.py:55
 msgid "Select 2"
-msgstr "Wybierz 2"
+msgstr ""
 
 #: dependencies.py:59
 msgid "Toastr"
@@ -75,7 +74,7 @@ msgstr ""
 
 #: settings.py:14
 msgid "Maximum number of characters that will be displayed as the view title."
-msgstr "Wyświetlono maksymalną liczbę znaków"
+msgstr ""
 
 #: templates/403.html:5 templates/403.html:9
 msgid "Insufficient permissions"
@@ -93,7 +92,7 @@ msgstr "Nie znaleziono strony"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Niestety, żądana strona nie została znaleziona."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Błąd serwera"
 
@@ -113,7 +112,7 @@ msgid ""
 "\n"
 "                    %(setting_project_title)s is based on %(project_title)s\n"
 "                "
-msgstr "\n%(setting_project_title)s opiera się na%(project_title)s"
+msgstr ""
 
 #: templates/appearance/about.html:82
 msgid "Version"
@@ -126,7 +125,7 @@ msgstr "Numer wersji: %(build_number)s"
 
 #: templates/appearance/about.html:97
 msgid "Released under the license:"
-msgstr "Opublikowane na podstawie licencji:"
+msgstr ""
 
 #: templates/appearance/about.html:103
 #, python-format
@@ -156,26 +155,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -183,7 +167,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -191,7 +175,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -200,29 +184,29 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
-msgstr "Ustawienia zaktualizowane. Aby zmiany przyniosły efekt zrestartuj instalację."
+msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Akcje"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Rozwiń listę"
 
 #: templates/appearance/generic_confirm.html:14
 msgid "Are you sure?"
-msgstr "Jesteś pewny?"
+msgstr ""
 
 #: templates/appearance/generic_confirm.html:34
 msgid "Yes"
@@ -296,15 +280,15 @@ msgstr "Rozwiń nawigację"
 msgid "No results"
 msgstr "Brak wyników"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Zamknij"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Błąd komunikacji z serwerem"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Sprawdź połączenie z siecią i spróbuj za chwilę."
 

mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Página não encontrada"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Desculpe, mas a página solicitada não foi encontrada."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr ""
 
@@ -152,26 +152,11 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -179,7 +164,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -187,7 +172,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -196,22 +181,22 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr ""
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Ações"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr ""
@@ -292,15 +277,15 @@ msgstr ""
 msgid "No results"
 msgstr "Sem resultados"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr ""
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr ""
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr ""
 

mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 23:14-0400\n"
-"PO-Revision-Date: 2019-09-04 03:25+0000\n"
+"POT-Creation-Date: 2019-07-05 01:27-0400\n"
+"PO-Revision-Date: 2019-07-05 05:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "Página não encontrada"
 msgid "Sorry, but the requested page could not be found."
 msgstr "Desculpe, mas a página solicitada não pôde ser encontrada."
 
-#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:53
+#: templates/500.html:5 templates/500.html:9 templates/appearance/root.html:52
 msgid "Server error"
 msgstr "Erro de servidor"
 
@@ -155,26 +155,11 @@ msgstr "\nSe você utiliza %(project_title)s, por favor, <a class=\"new_window\"
 #, python-format
 msgid ""
 "\n"
-"                You can also <a class=\"new_window\" href=\"https://www.paypal.com/paypalme2/RobertoRosario\">donate directly to the creator and lead developer.  %(icon_social_paypal)s</a>\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:127
-msgid ""
-"\n"
-"                Besides donations you can also support the project by <a class=\"new_window\" href=\"https://sellfy.com/p/um2fkx/\">purchasing a copy of the book \"Exploring Mayan EDMS\" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.\n"
-"            "
-msgstr ""
-
-#: templates/appearance/about.html:133
-#, python-format
-msgid ""
-"\n"
 "                The complete list of changes is available via the <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Release notes %(icon_documentation)s</a> or the short version <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">Changelog %(icon_documentation)s</a>.\n"
 "            "
 msgstr "\nA lista de mudanças está disponível de maneira detalhada nas <a class=\"new_window\" href=\"https://docs.mayan-edms.com/releases/index.html\">Notas de Lançamento %(icon_documentation)s</a> ou,  em versão mais curta, <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst\">no Registro de Mudanças%(icon_documentation)s</a>."
 
-#: templates/appearance/about.html:139
+#: templates/appearance/about.html:127
 #, python-format
 msgid ""
 "\n"
@@ -182,7 +167,7 @@ msgid ""
 "            "
 msgstr "\nCaso tenha dúvidas consulte a <a class=\"new_window\" href=\"https://docs.mayan-edms.com\">Documentação%(icon_documentation)s</a> ou a <a class=\"new_window\" href=\"https://wiki.mayan-edms.com\">Wiki%(icon_wiki)s</a>."
 
-#: templates/appearance/about.html:145
+#: templates/appearance/about.html:133
 #, python-format
 msgid ""
 "\n"
@@ -190,7 +175,7 @@ msgid ""
 "            "
 msgstr "\nSe você encontrar algum erro ou tiver ideias para novos recursos, visite o <a class=\"new_window\" href=\"https://forum.mayan-edms.com\">Fórum%(icon_forum)s</a> ou abra um chamado no <a class=\"new_window\" href=\"https://gitlab.com/mayan-edms/mayan-edms\">Repositório de Código Fonte%(icon_source_code)s</a>."
 
-#: templates/appearance/about.html:150
+#: templates/appearance/about.html:138
 #, python-format
 msgid ""
 "\n"
@@ -199,22 +184,22 @@ msgid ""
 "            "
 msgstr "\n\nEspalhe a palavra! Fale com seus amigos e colegas sobre como o %(project_title)s é incrível!\nSiga-nos no <a class=\"new_window\" href=\"https://twitter.com/mayanedms\">Twitter %(icon_social_twitter)s</a>, <a class=\"new_window\" href=\"https://www.facebook.com/MayanEDMS/\">Facebook %(icon_social_facebook)s</a>, ou <a class=\"new_window\" href=\"https://www.instagram.com/mayan_edms/\">Instagram%(icon_social_instagram)s</a>"
 
-#: templates/appearance/base.html:36 templates/appearance/base.html:46
+#: templates/appearance/base.html:32 templates/appearance/base.html:42
 msgid "Warning"
 msgstr "Advertência"
 
-#: templates/appearance/base.html:46
+#: templates/appearance/base.html:42
 msgid ""
 "Settings updated, restart your installation for changes to take proper "
 "effect."
 msgstr ""
 
-#: templates/appearance/base.html:60
+#: templates/appearance/base.html:59
 #: templates/appearance/generic_list_items_subtemplate.html:104
 msgid "Actions"
 msgstr "Ações"
 
-#: templates/appearance/base.html:62
+#: templates/appearance/base.html:61
 #: templates/appearance/generic_list_items_subtemplate.html:106
 msgid "Toggle Dropdown"
 msgstr "Mostrar/esconder menu"
@@ -295,15 +280,15 @@ msgstr "Ativar/desativar navegação"
 msgid "No results"
 msgstr "Nenhum resultado"
 
-#: templates/appearance/root.html:58
+#: templates/appearance/root.html:57
 msgid "Close"
 msgstr "Fechar"
 
-#: templates/appearance/root.html:66
+#: templates/appearance/root.html:65
 msgid "Server communication error"
 msgstr "Erro na comunicação com o servidor"
 
-#: templates/appearance/root.html:68
+#: templates/appearance/root.html:67
 msgid "Check you network connection and try again in a few moments."
 msgstr "Verifique sua conexão de rede e tente novamente em alguns instantes. "