Merge branch 'master' into dev

.gitignore

@@ -66,6 +66,7 @@ media/overrides.js
 
 # Sqlite database
 db.sqlite3
+db.sqlite3-journal
 
 # PyCharm
 .idea

.travis.yml

@@ -12,6 +12,21 @@ matrix:
         - python: "3.5"
         - python: "3.6"
         - python: "3.7-dev"
+        - env:
+            - BUILD_DOCKER=1
+            # Variable to add to publish the Docker image:
+            # * DOCKER_USERNAME
+            # * DOCKER_PASSWORD, to be encrypted, use `travis encrypt DOCKER_PASSWORD=<password>`
+          services:
+            - docker
+          before_install:
+            - true
+          install:
+            - true
+          script:
+            - docker build --tag=the-paperless-project/paperless .
+          after_success:
+            - true
 
 install:
     - pip install --upgrade pip pipenv sphinx
@@ -26,3 +41,17 @@ script:
 
 after_success:
   - coveralls
+
+deploy:
+  - provider: script
+    skip_cleanup: true
+    script: ci/deploy-docker
+    on:
+      tags: true
+      condition: '"${BUILD_DOCKER}" = 1'
+  - provider: script
+    skip_cleanup: true
+    script: ci/deploy-docker
+    on:
+      branch: master
+      condition: '"${BUILD_DOCKER}" = 1'

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.8
 
-LABEL maintainer="The Paperless Project https://github.com/danielquinn/paperless" \
+LABEL maintainer="The Paperless Project https://github.com/the-paperless-project/paperless" \
       contributors="Guy Addadi <[email protected]>, Pit Kleyersburg <[email protected]>, \
         Sven Fischer <[email protected]>"
 
@@ -12,11 +12,30 @@ COPY scripts/docker-entrypoint.sh /sbin/docker-entrypoint.sh
 ENV PAPERLESS_EXPORT_DIR=/export \
     PAPERLESS_CONSUMPTION_DIR=/consume
 
-
-RUN apk update --no-cache && apk add python3 gnupg libmagic libpq bash shadow curl \
-        sudo poppler tesseract-ocr imagemagick ghostscript unpaper optipng && \
-    apk add --virtual .build-dependencies \
-        python3-dev poppler-dev postgresql-dev gcc g++ musl-dev zlib-dev jpeg-dev && \
+RUN apk add --no-cache \
+      bash \
+      curl \
+      ghostscript \
+      gnupg \
+      imagemagick \
+      libmagic \
+      libpq \
+      optipng \
+      poppler \
+      python3 \
+      shadow \
+      sudo \
+      tesseract-ocr \
+      unpaper && \
+    apk add --no-cache --virtual .build-dependencies \
+      g++ \
+      gcc \
+      jpeg-dev \
+      musl-dev \
+      poppler-dev \
+      postgresql-dev \
+      python3-dev \
+      zlib-dev && \
 # Install python dependencies
     python3 -m ensurepip && \
     rm -r /usr/lib/python*/ensurepip && \

Pipfile

@@ -34,6 +34,8 @@ pytest-django = "*"
 pytest-sugar = "*"
 pytest-env = "*"
 pytest-xdist = "*"
+psycopg2 = "*"
+djangoql = "*"
 
 [dev-packages]
 ipython = "*"

README-de.md

@@ -1,8 +1,8 @@
 [ [en](README.md) | de | [el](README-el.md) ]
 
-![Paperless](https://raw.githubusercontent.com/danielquinn/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
+![Paperless](https://raw.githubusercontent.com/the-paperless-project/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
 
-[![Dokumentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/) [![Chat](https://badges.gitter.im/danielquinn/paperless.svg)](https://gitter.im/danielquinn/paperless) [![Travis](https://travis-ci.org/danielquinn/paperless.svg?branch=master)](https://travis-ci.org/danielquinn/paperless) [![Coverage Status](https://coveralls.io/repos/github/danielquinn/paperless/badge.svg?branch=master)](https://coveralls.io/github/danielquinn/paperless?branch=master) [![Danke](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/danielquinn/paperless/blob/master/THANKS.md)
+[![Dokumentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/) [![Chat](https://badges.gitter.im/the-paperless-project/paperless.svg)](https://gitter.im/danielquinn/paperless) [![Travis](https://travis-ci.org/the-paperless-project/paperless.svg?branch=master)](https://travis-ci.org/the-paperless-project/paperless) [![Coverage Status](https://coveralls.io/repos/github/the-paperless-project/paperless/badge.svg?branch=master)](https://coveralls.io/github/the-paperless-project/paperless?branch=master) [![Danke](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/the-paperless-project/paperless/blob/master/THANKS.md)
 
 Indexiere und archiviere alle deine eingescannten Papierdokumente
 
@@ -28,7 +28,7 @@ Paperless steuert nicht deinen Scanner, es hilft nur damit umzugehen, was der Sc
 
 Hier das, was du bekommt:
 
-![Vorher und Nachher](https://raw.githubusercontent.com/danielquinn/paperless/master/docs/_static/screenshot.png)
+![Vorher und Nachher](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
 
 ## Dokumentation

README-el.md

@@ -1,8 +1,8 @@
 [ [en](README.md) | [de](README-de.md) | el ]
 
-![Paperless](https://raw.githubusercontent.com/danielquinn/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
+![Paperless](https://raw.githubusercontent.com/the-paperless-project/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
 
-[![Documentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/) [![Chat](https://badges.gitter.im/danielquinn/paperless.svg)](https://gitter.im/danielquinn/paperless) [![Travis](https://travis-ci.org/danielquinn/paperless.svg?branch=master)](https://travis-ci.org/danielquinn/paperless) [![Coverage Status](https://coveralls.io/repos/github/danielquinn/paperless/badge.svg?branch=master)](https://coveralls.io/github/danielquinn/paperless?branch=master) [![Thanks](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/danielquinn/paperless/blob/master/THANKS.md)
+[![Documentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/) [![Chat](https://badges.gitter.im/the-paperless-project/paperless.svg)](https://gitter.im/danielquinn/paperless) [![Travis](https://travis-ci.org/the-paperless-project/paperless.svg?branch=master)](https://travis-ci.org/the-paperless-project/paperless) [![Coverage Status](https://coveralls.io/repos/github/the-paperless-project/paperless/badge.svg?branch=master)](https://coveralls.io/github/the-paperless-project/paperless?branch=master) [![Thanks](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/the-paperless-project/paperless/blob/master/THANKS.md)
 
 Ευρετήριο και αρχείο για όλα σας τα σκαναρισμένα έγγραφα
 
@@ -27,7 +27,7 @@
 
 Αυτό είναι που θα πάρετε:
 
-![Το πριν και το μετά](https://raw.githubusercontent.com/danielquinn/paperless/master/docs/_static/screenshot.png)
+![Το πριν και το μετά](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
 
 ## Documentation

README.md

@@ -1,8 +1,13 @@
 [ en | [de](README-de.md) | [el](README-el.md) ]
 
-![Paperless](https://raw.githubusercontent.com/danielquinn/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
+![Paperless](https://raw.githubusercontent.com/the-paperless-project/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
 
-[![Documentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/) [![Chat](https://badges.gitter.im/danielquinn/paperless.svg)](https://gitter.im/danielquinn/paperless) [![Travis](https://travis-ci.org/danielquinn/paperless.svg?branch=master)](https://travis-ci.org/danielquinn/paperless) [![Coverage Status](https://coveralls.io/repos/github/danielquinn/paperless/badge.svg?branch=master)](https://coveralls.io/github/danielquinn/paperless?branch=master) [![Thanks](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/danielquinn/paperless/blob/master/THANKS.md)
+[![Documentation](https://readthedocs.org/projects/paperless/badge/?version=latest)](https://paperless.readthedocs.org/)
+[![Chat](https://badges.gitter.im/the-paperless-project/paperless.svg)](https://gitter.im/danielquinn/paperless)
+[![Travis](https://travis-ci.org/the-paperless-project/paperless.svg?branch=master)](https://travis-ci.org/the-paperless-project/paperless)
+[![Coverage Status](https://coveralls.io/repos/github/the-paperless-project/paperless/badge.svg?branch=master)](https://coveralls.io/github/the-paperless-project/paperless?branch=master)
+[![StackShare](https://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/the-paperless-project/the-paperless-project)
+[![Thanks](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](https://github.com/the-paperless-project/paperless/blob/master/THANKS.md)
 
 Index and archive all of your scanned paper documents
 
@@ -27,12 +32,12 @@ Paperless does not control your scanner, it only helps you deal with what your s
 
 Here's what you get:
 
-![The before and after](https://raw.githubusercontent.com/danielquinn/paperless/master/docs/_static/screenshot.png)
+![The before and after](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
 
 ## Documentation
 
-It's all available on [ReadTheDocs](https://paperless.readthedocs.org/).
+It's all available on [ReadTheDocs](https://paperless.readthedocs.io/).
 
 
 ## Requirements
@@ -63,11 +68,11 @@ Paperless has been around a while now, and people are starting to build stuff on
 
 * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
-
+* [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
 ## Similar Projects
 
-There's another project out there called [Mayan EDMS](https://mayan.readthedocs.org/en/latest/) that has a surprising amount of technical overlap with Paperless.  Also based on Django and using a consumer model with Tesseract and Unpaper, Mayan EDMS is *much* more featureful and comes with a slick UI as well, but still in Python 2. It may be that Paperless consumes fewer resources, but to be honest, this is just a guess as I haven't tested this myself.  One thing's for certain though, *Paperless* is a **way** better name.
+There's another project out there called [Mayan EDMS](https://www.mayan-edms.com/) that has a surprising amount of technical overlap with Paperless.  Also based on Django and using a consumer model with Tesseract and Unpaper, Mayan EDMS is *much* more featureful and comes with a slick UI as well, but still in Python 2. It may be that Paperless consumes fewer resources, but to be honest, this is just a guess as I haven't tested this myself.  One thing's for certain though, *Paperless* is a **way** better name.
 
 
 ## Important Note

ci/deploy-docker

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "${DOCKER_USERNAME}" == "" -o "${DOCKER_PASSWORD}" == "" ]
+then
+    exit 0
+fi
+
+docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD}
+if [ "${TRAVIS_TAG}" != "" ]
+then
+    docker tag the-paperless-project/paperless the-paperless-project/paperless:${TRAVIS_TAG}
+    docker push the-paperless-project/paperless:${TRAVIS_TAG}
+else
+    docker push the-paperless-project/paperless
+fi

docker-compose.yml.example

@@ -17,9 +17,9 @@ services:
         volumes:
             - data:/usr/src/paperless/data
             - media:/usr/src/paperless/media
-						# You have to adapt the local path you want the consumption
+            # You have to adapt the local path you want the consumption
             # directory to mount to by modifying the part before the ':'.
-						- ./consume:/consume
+            - ./consume:/consume
         env_file: docker-compose.env
         # The reason the line is here is so that the webserver that doesn't do
         # any text recognition and doesn't have to install unnecessary
@@ -40,7 +40,7 @@ services:
             - data:/usr/src/paperless/data
             - media:/usr/src/paperless/media
             # This should be set to the same value as the consume directory
-					  # in the webserver service above.
+            # in the webserver service above.
             - ./consume:/consume
             # Likewise, you can add a local path to mount a directory for
             # exporting. This is not strictly needed for paperless to