install script: configure time zone

Suppport search term PDF open parameter

Dockerfile

@@ -11,25 +11,27 @@ RUN ./configure && make
 FROM python:3.7-slim
 
 # Binary dependencies
-RUN apt-get update \
+RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list \
+  && apt-get update \
   && apt-get -y --no-install-recommends install \
   	# Basic dependencies
 		curl \
-		file \
-		# fonts for text file thumbnail generation
-		fonts-liberation \
-		# for making translations further down
-		gettext \
 		gnupg \
 		imagemagick \
+		gettext \
+		sudo \
+		tzdata \
+		# fonts for text file thumbnail generation
+		fonts-liberation \
 		# for Numpy
 		libatlas-base-dev \
 		libxslt1-dev \
-		mime-support \
 		# thumbnail size reduction
 		optipng \
-		sudo \
-		tzdata \
+		# Mime type detection
+		file \
+		libmagic-dev \
+		media-types \
   	# OCRmyPDF dependencies
 		ghostscript \
 		icc-profiles-free \
@@ -45,14 +47,7 @@ RUN apt-get update \
 		tesseract-ocr-spa \
 		unpaper \
 		zlib1g \
-
-# This pulls in updated dependencies from bullseye to fix some issues with file type detection.
-# TODO: Remove this once bullseye releases.
-  && echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list \
-  && apt-get update \
-  && apt-get install --no-install-recommends -y file libmagic-dev \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm /etc/apt/sources.list.d/bullseye.list
+  && rm -rf /var/lib/apt/lists/*
 
 # copy jbig2enc
 COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/

Pipfile

@@ -24,9 +24,8 @@ langdetect = "*"
 # numpy 1.20.0 drops python 3.6 support
 numpy = "~=1.19.5"
 pathvalidate = "*"
-# pinned to 8.1.0, since aarch64 wheels might not be available beyond that https://github.com/python-pillow/Pillow/issues/5202
-pillow = "==8.1.0"
-pikepdf = "~=2.5.0"
+pillow = "~=8.1"
+pikepdf = "~=2.5"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
@@ -52,7 +51,6 @@ uvicorn = {extras = ["standard"], version = "*"}
 concurrent-log-handler = "*"
 # uvloop 0.15+ incompatible with python 3.6
 uvloop = "~=0.14.0"
-# TODO: keep an eye on piwheel builds and update this once available (https://www.piwheels.org/project/cryptography/)
 cryptography = "~=3.4"
 "pdfminer.six" = "*"
 

README.md

@@ -1,5 +1,6 @@
 [![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)](https://github.com/jonaswinkler/paperless-ng/actions)
 ![Ansible Role](https://github.com/jonaswinkler/paperless-ng/workflows/Ansible%20Role/badge.svg)
+[![Crowdin](https://badges.crowdin.net/paperless-ng/localized.svg)](https://crowdin.com/project/paperless-ng)
 [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest)
 [![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng)
@@ -11,12 +12,12 @@
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. These key points should help you decide whether Paperless-ng is something you would prefer over Paperless:
 
-* Interface: The new front end is the main interface for paperless-ng, the old interface still exists but most customizations (such as thumbnails for the document list) have been removed.
+* Interface: The new front end is the main interface for Paperless-ng, the old interface still exists but most customizations (such as thumbnails for the document list) have been removed.0
 * Encryption: Paperless-ng does not support GnuPG anymore, since storing your data on encrypted file systems (that you optionally mount on demand) achieves about the same result.
-* Resource usage: Paperless-ng does use a bit more resources than Paperless. Running the web server requires about 300MB of RAM or more, depending on the configuration. While adding documents, it requires about 300MB additional RAM, depending on the document. It still runs on Pi (many users do that), but it has been generally geared to better use the resources of more powerful systems.
+* Resource usage: Paperless-ng does use a bit more resources than Paperless. Running the web server requires about 300MB of RAM or more, depending on the configuration. While adding documents, it requires about 300MB additional RAM, depending on the document. It still runs on Raspberry Pi (many users do that), but it has been generally geared to better use the resources of more powerful systems.
 * API changes: If you rely on the REST API of paperless, some of its functionality has been changed.
 
-For a detailed list of changes, have a look at the [change log](https://paperless-ng.readthedocs.io/en/latest/changelog.html) in the documentation.
+For a detailed list of changes, have a look at the [change log](https://paperless-ng.readthedocs.io/en/latest/changelog.html) in the documentation, especially the section about the [0.9.0 release](https://paperless-ng.readthedocs.io/en/latest/changelog.html#paperless-ng-0-9-0).
 
 # How it Works
 
@@ -24,7 +25,7 @@ Paperless does not control your scanner, it only helps you deal with what your s
 
 1. Buy a document scanner that can write to a place on your network.  If you need some inspiration, have a look at the [scanner recommendations](https://paperless-ng.readthedocs.io/en/latest/scanners.html) page. Set it up to "scan to FTP" or something similar. It should be able to push scanned images to a server without you having to do anything.  Of course if your scanner doesn't know how to automatically upload the file somewhere, you can always do that manually. Paperless doesn't care how the documents get into its local consumption directory.
 
-	- Alternatively, you can use any of the mobile scanning apps out there. We have an app that allows you to share documents with paperless, if you're on Android. See the section on affiliated projects.
+	- Alternatively, you can use any of the mobile scanning apps out there. We have an app that allows you to share documents with paperless, if you're on Android. See the section on affiliated projects below.
 
 2. Wait for paperless to process your files. OCR is expensive, and depending on the power of your machine, this might take a bit of time.
 3. Use the web frontend to sift through the database and find what you want.
@@ -34,6 +35,8 @@ Here's what you get:
 
 ![Dashboard](https://github.com/jonaswinkler/paperless-ng/raw/master/docs/_static/screenshots/dashboard.png)
 
+If you want to see paperless-ng in action, [more screenshots are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
+
 # Features
 
 * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
@@ -57,19 +60,17 @@ Here's what you get:
 * Optimized for multi core systems: Paperless-ng consumes multiple documents in parallel.
 * The integrated sanity checker makes sure that your document archive is in good health.
 
-If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
-
 # Getting started
 
 The recommended way to deploy paperless is docker-compose. The files in the /docker/hub directory are configured to pull the image from Docker Hub.
 
 Read the [documentation](https://paperless-ng.readthedocs.io/en/latest/setup.html#installation) on how to get started.
 
-Alternatively, you can install the dependencies and setup apache and a database server yourself. The documenation has a step by step guide on how to do it.
+Alternatively, you can install the dependencies and setup apache and a database server yourself. The documenation has a step by step guide on how to do it. Consider giving the Ansible role a shot, this essentially automates the entire bare metal installation process.
 
-# Migrating to paperless-ng
+# Migrating from Paperless to Paperless-ng
 
-Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest/setup.html#migration-to-paperless-ng) in the documentation. Its also entirely possible to go back to paperless by reverting the database migrations.
+Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest/setup.html#migration-to-paperless-ng) in the documentation. Its also entirely possible to go back to Paperless by reverting the database migrations.
 
 # Documentation
 
@@ -77,9 +78,7 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle
 
 # Translation
 
-Paperless is currently available in English, German, Dutch, French, and Portuguese.
-
-There's an active translation project at transifex! If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details.
+Paperless is available in many different languages. Translation is coordinated at crowdin. If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details!
 
 # Feature Requests
 
@@ -93,7 +92,7 @@ For bugs please [open an issue](https://github.com/jonaswinkler/paperless-ng/iss
 
 There's still lots of things to be done, just have a look at open issues & discussions. If you feel like contributing to the project, please do! Bug fixes and improvements to the front end (I just can't seem to get some of these CSS things right) are always welcome. The documentation has some basic information on how to get started.
 
-If you want to implement something big: Please start a discussion about that in the issues! Maybe I've already had something similar in mind and we can make it happen together. However, keep in mind that the general roadmap is to make the existing features stable and get them tested. See the roadmap above.
+If you want to implement something big: Please start a discussion about that! Maybe I've already had something similar in mind and we can make it happen together. However, keep in mind that the general roadmap is to make the existing features stable and get them tested.
 
 # Affiliated Projects
 

crowdin.yml

@@ -1,3 +1,4 @@
+commit_message: '[ci skip]'
 files:
   - source: /src/locale/en_US/LC_MESSAGES/django.po
     translation: /src/locale/%locale_with_underscore%/LC_MESSAGES/django.po

docker/docker-entrypoint.sh

@@ -68,6 +68,17 @@ migrations() {
 
 }
 
+search_index() {
+	index_version=1
+	index_version_file=/usr/src/paperless/data/.index_version
+
+	if [[ (! -f "$index_version_file") || $(< $index_version_file) != "$index_version" ]]; then
+		echo "Search index out of date. Updating..."
+		sudo -HEu paperless python3 manage.py document_index reindex
+		echo $index_version | sudo -HEu paperless tee $index_version_file >/dev/null
+	fi
+}
+
 initialize() {
 	map_uidgid
 
@@ -87,6 +98,7 @@ initialize() {
 
 	migrations
 
+	search_index
 }
 
 install_languages() {

docs/administration.rst

@@ -193,7 +193,9 @@ This table lists the compatible versions for each database migration number.
 +------------------+-----------------+
 | 1012             | 1.1.0 - 1.2.1   |
 +------------------+-----------------+
-| 1014             | 1.3.0 - current |
+| 1014             | 1.3.0 - 1.3.1   |
++------------------+-----------------+
+| 1016             | 1.3.2 - current |
 +------------------+-----------------+
 
 Execute the following management command to migrate your database:

docs/advanced_usage.rst

@@ -10,14 +10,13 @@ easier.
 Matching tags, correspondents and document types
 ################################################
 
-After the consumer has tried to figure out what it could from the file name,
-it starts looking at the content of the document itself.  It will compare the
-matching algorithms defined by every tag and correspondent already set in your
-database to see if they apply to the text in that document.  In other words,
-if you defined a tag called ``Home Utility`` that had a ``match`` property of
-``bc hydro`` and a ``matching_algorithm`` of ``literal``, Paperless will
-automatically tag your newly-consumed document with your ``Home Utility`` tag
-so long as the text ``bc hydro`` appears in the body of the document somewhere.
+Paperless will compare the matching algorithms defined by every tag and
+correspondent already set in your database to see if they apply to the text in
+a document.  In other words, if you defined a tag called ``Home Utility``
+that had a ``match`` property of ``bc hydro`` and a ``matching_algorithm`` of
+``literal``, Paperless will automatically tag your newly-consumed document with
+your ``Home Utility`` tag so long as the text ``bc hydro`` appears in the body
+of the document somewhere.
 
 The matching logic is quite powerful, and supports searching the text of your
 document with different algorithms, and as such, some experimentation may be

docs/api.rst

@@ -147,93 +147,57 @@ The REST api provides three different forms of authentication.
 Searching for documents
 #######################
 
-Paperless-ng offers API endpoints for full text search. These are as follows:
+Full text searching is available on the ``/api/documents/`` endpoint. Two specific
+query parameters cause the API to return full text search results:
 
-``/api/search/``
-================
+*   ``/api/documents/?query=your%20search%20query``: Search for a document using a full text query.
+    For details on the syntax, see :ref:`basic-usage_searching`.
 
-Get search results based on a query.
+*   ``/api/documents/?more_like=1234``: Search for documents similar to the document with id 1234.
 
-Query parameters:
+Pagination works exactly the same as it does for normal requests on this endpoint.
 
-*   ``query``: The query string. See
-    `here <https://whoosh.readthedocs.io/en/latest/querylang.html>`_
-    for details on the syntax.
-*   ``page``: Specify the page you want to retrieve. Each page
-    contains 10 search results and the first page is ``page=1``, which
-    is the default if this is omitted.
+Certain limitations apply to full text queries:
 
-Result list object returned by the endpoint:
+*   Results are always sorted by search score. The results matching the query best will show up first.
 
-.. code:: json
+*   Only a small subset of filtering parameters are supported.
+
+Furthermore, each returned document has an additional ``__search_hit__`` attribute with various information
+about the search results:
+
+.. code::
 
     {
-        "count": 1,
-        "page": 1,
-        "page_count": 1,
-        "corrected_query": "",
+        "count": 31,
+        "next": "http://localhost:8000/api/documents/?page=2&query=test",
+        "previous": null,
         "results": [
 
+            ...
+
+            {
+                "id": 123,
+                "title": "title",
+                "content": "content",
+
+                ...
+
+                "__search_hit__": {
+                    "score": 0.343,
+                    "highlights": "text <span class=\"match\">Test</span> text",
+                    "rank": 23
+                }
+            },
+
+            ...
+
         ]
     }
 
-*   ``count``: The approximate total number of results.
-*   ``page``: The page returned to you. This might be different from
-    the page you requested, if you requested a page that is behind
-    the last page. In that case, the last page is returned.
-*   ``page_count``: The total number of pages.
-*   ``corrected_query``: Corrected version of the query string. Can be null.
-    If not null, can be used verbatim to start a new query.
-*   ``results``: A list of result objects on the current page.
-
-Result object:
-
-.. code:: json
-
-    {
-        "id": 1,
-        "highlights": [
-
-        ],
-        "score": 6.34234,
-        "rank": 23,
-        "document": {
-
-        }
-    }
-
-*   ``id``: the primary key of the found document
-*   ``highlights``: an object containing parsable highlights for the result.
-    See below.
-*   ``score``: The score assigned to the document. A higher score indicates a
-    better match with the query. Search results are sorted descending by score.
-*   ``rank``: the position of the document within the entire search results list.
-*   ``document``: The full json of the document, as returned by
-    ``/api/documents/<id>/``.
-
-Highlights object:
-
-Highlights are provided as a list of fragments. A fragment is a longer section of
-text from the original document.
-Each fragment contains a list of strings, and some of them are marked as a highlight.
-
-.. code:: json
-
-    [
-        [
-            {"text": "This is a sample text with a ", "highlight": false},
-            {"text": "highlighted", "highlight": true},
-            {"text": " word.", "highlight": false}
-        ],
-        [
-            {"text": "Another", "highlight": true},
-            {"text": " fragment with a highlight.", "highlight": false}
-        ]
-    ]
-
-A client may use this example to produce the following output:
-
-... This is a sample text with a **highlighted** word. ... **Another** fragment with a highlight. ...
+*   ``score`` is an indication how well this document matches the query relative to the other search results.
+*   ``highlights`` is an excerpt from the document content and highlights the search terms with ``<span>`` tags as shown above.
+*   ``rank`` is the index of the search results. The first result will have rank 0.
 
 ``/api/search/autocomplete/``
 =============================

docs/changelog.rst

@@ -5,6 +5,90 @@
 Changelog
 *********
 
+paperless-ng 1.4.0
+##################
+
+* Docker images now use tesseract 4.1.1, which should fix a series of issues with OCR.
+
+* The full text search now displays results using the default document list. This enables
+  selection, filtering and bulk edit on search results.
+
+* Changes
+
+  * Firefox only: Highlight search query in PDF previews.
+
+  * New URL pattern for accessing documents by ASN directly (http://<paperless>/asn/123)
+
+  * Added logging when executing pre- and post-consume scripts.
+
+  * Better error logging during document consumption.
+
+  * Updated python dependencies.
+
+  * Automatically inserts typed text when opening "Create new" dialogs on the document details page.
+
+* Fixes
+
+  * Fixed an issue with null characters in the document content.
+
+.. note::
+
+  The changed to the full text searching require you to reindex your documents.
+  *The docker image does this automatically, you don't need to do anything.*
+  To do this, execute the ``document_index reindex`` management command
+  (see :ref:`administration-index`).
+
+.. note::
+
+  Some packages that paperless depends on are slowly dropping Python 3.6
+  support one after another, including the web server. Supporting Python
+  3.6 means that I cannot update these packages anymore.
+
+  At some point, paperless will drop Python 3.6 support. If using a bare
+  metal installation and you're still on Python 3.6, upgrade to 3.7 or newer.
+
+  If using docker, this does not affect you.
+
+paperless-ng 1.3.2
+##################
+
+* Added translation into Portuguese.
+
+* Changes
+
+  * The exporter now exports user accounts, mail accounts, mail rules and saved views as well.
+
+* Fixes
+
+  * Minor layout issues with document cards and the log viewer.
+
+  * Fixed an issue with any/all/exact matching when characters used in regular expressions were used for the match.
+
+paperless-ng 1.3.1
+##################
+
+* Added translation into Spanish and Russian.
+
+* Other changes
+
+  * ISO-8601 date format will now always show years with 4 digits.
+
+  * Added the ability to search for a document with a specific ASN.
+
+  * The document cards now display ASN, types and dates in a more organized way.
+
+  * Added document previews when hovering over the preview button.
+
+* Fixes
+
+  * The startup check for write permissions now works properly on NFS shares.
+
+  * Fixed an issue with the search results score indicator.
+
+  * Paperless was unable to generate thumbnails for encrypted PDF files and failed. Paperless will now generate a default thumbnail for these files.
+
+  * Fixed ``AUTO_LOGIN_USERNAME``: Unable to perform POST/PUT/DELETE requests and unable to receive WebSocket messages.
+
 paperless-ng 1.3.0
 ##################
 
@@ -68,17 +152,6 @@ paperless-ng 1.2.0
 
 * Paperless no longer depends on ``libpoppler-cpp-dev``.
 
-.. note::
-
-  Some packages that paperless depends on are slowly dropping Python 3.6
-  support one after another, including the web server. Supporting Python
-  3.6 means that I cannot update these packages anymore.
-
-  At some point, paperless will drop Python 3.6 support. If using a bare
-  metal installation and you're still on Python 3.6, upgrade to 3.7 or newer.
-
-  If using docker, this does not affect you.
-
 paperless-ng 1.1.4
 ##################
 

docs/scanners.rst

@@ -13,26 +13,35 @@ that works right for you based on recommendations from other Paperless users.
 Physical scanners
 =================
 
-+---------+----------------+-----+-----+-----+----------------+
-| Brand   | Model          | Supports        | Recommended By |
-+---------+----------------+-----+-----+-----+----------------+
-|         |                | FTP | NFS | SMB |                |
-+=========+================+=====+=====+=====+================+
-| Brother | `ADS-1500W`_   | yes | no  | yes | `danielquinn`_ |
-+---------+----------------+-----+-----+-----+----------------+
-| Brother | `MFC-J6930DW`_ | yes |     |     | `ayounggun`_   |
-+---------+----------------+-----+-----+-----+----------------+
-| Brother | `MFC-J5910DW`_ | yes |     |     | `bmsleight`_   |
-+---------+----------------+-----+-----+-----+----------------+
-| Brother | `MFC-9142CDN`_ | yes |     | yes | `REOLDEV`_     |
-+---------+----------------+-----+-----+-----+----------------+
-| Fujitsu | `ix500`_       | yes |     | yes | `eonist`_      |
-+---------+----------------+-----+-----+-----+----------------+
-| Epson   | `WF-7710DWF`_  | yes |     | yes | `Skylinar`_    |
-+---------+----------------+-----+-----+-----+----------------+
-| Fujitsu | `S1300i`_      | yes |     | yes | `jonaswinkler`_|
-+---------+----------------+-----+-----+-----+----------------+
++---------+----------------+-----+-----+-----+------+----------------+
+| Brand   | Model          | Supports               | Recommended By |
++---------+----------------+-----+-----+-----+------+----------------+
+|         |                | FTP | NFS | SMB | SMTP |                |
++=========+================+=====+=====+=====+======+================+
+| Brother | `ADS-1700W`_   | yes | no  | yes | yes  |`holzhannes`_   |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `ADS-1600W`_   | yes | no  | yes | yes  |`holzhannes`_   |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `ADS-1500W`_   | yes | no  | yes | yes  |`danielquinn`_  |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `MFC-J6930DW`_ | yes |     |     |      |`ayounggun`_    |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `MFC-L5850DW`_ | yes |     |     | yes  |`holzhannes`_   |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `MFC-J5910DW`_ | yes |     |     |      |`bmsleight`_    |
++---------+----------------+-----+-----+-----+------+----------------+
+| Brother | `MFC-9142CDN`_ | yes |     | yes |      |`REOLDEV`_      |
++---------+----------------+-----+-----+-----+------+----------------+
+| Fujitsu | `ix500`_       | yes |     | yes |      |`eonist`_       |
++---------+----------------+-----+-----+-----+------+----------------+
+| Epson   | `WF-7710DWF`_  | yes |     | yes |      |`Skylinar`_     |
++---------+----------------+-----+-----+-----+------+----------------+
+| Fujitsu | `S1300i`_      | yes |     | yes |      |`jonaswinkler`_ |
++---------+----------------+-----+-----+-----+------+----------------+
 
+.. _MFC-L5850DW: https://www.brother-usa.com/products/mfcl5850dw
+.. _ADS-1700W: https://www.brother-usa.com/products/ads1700w
+.. _ADS-1600W: https://www.brother-usa.com/products/ads1600w
 .. _ADS-1500W: https://www.brother.ca/en/p/ads1500w
 .. _MFC-J6930DW: https://www.brother.ca/en/p/MFCJ6930DW
 .. _MFC-J5910DW: https://www.brother.co.uk/printers/inkjet-printers/mfcj5910dw
@@ -41,6 +50,7 @@ Physical scanners
 .. _WF-7710DWF: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
 .. _S1300i: https://www.fujitsu.com/global/products/computing/peripheral/scanners/soho/s1300i/
 
+
 .. _danielquinn: https://github.com/danielquinn
 .. _ayounggun: https://github.com/ayounggun
 .. _bmsleight: https://github.com/bmsleight
@@ -48,25 +58,33 @@ Physical scanners
 .. _REOLDEV: https://github.com/REOLDEV
 .. _Skylinar: https://github.com/Skylinar
 .. _jonaswinkler: https://github.com/jonaswinkler
+.. _holzhannes: https://github.com/holzhannes
 
 Mobile phone software
 =====================
 
 You can use your phone to "scan" documents. The regular camera app will work, but may have too low contrast for OCR to work well. Apps specifically for scanning are recommended.
 
-+-------------------+----------------+-----+-----+-----+-------+--------+----------------+
-| Name              | OS             | Supports                         | Recommended By |
-+-------------------+----------------+-----+-----+-----+-------+--------+----------------+
-|                   |                | FTP | NFS | SMB | Email | WebDav |                |
-+===================+================+=====+=====+=====+=======+========+================+
-| `Office Lens`_    | Android        | ?   | ?   | ?   | ?     | ?      | `jonaswinkler`_|
-+-------------------+----------------+-----+-----+-----+-------+--------+----------------+
-| `Genius Scan`_    | Android        | yes | no  | yes | yes   | yes    | `hannahswain`_ |
-+-------------------+----------------+-----+-----+-----+-------+--------+----------------+
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
+| Name              | OS             | Supports                         | Recommended By   |
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
+|                   |                | FTP | NFS | SMB | Email | WebDav |                  |
++===================+================+=====+=====+=====+=======+========+==================+
+| `Office Lens`_    | Android        | ?   | ?   | ?   | ?     | ?      | `jonaswinkler`_  |
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
+| `Genius Scan`_    | Android        | yes | no  | yes | yes   | yes    | `hannahswain`_   |
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
+| `OpenScan`_       | Android        | no  | no  | no  | no    | no     | `benjaminfrank`_ |
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
+| `Quick Scan`_     | iOS            | no  | no  | no  | no    | no     | `holzhannes`_    |
++-------------------+----------------+-----+-----+-----+-------+--------+------------------+
 
-On Android, you can use these applications in combination with one of the :ref:`Paperless-ng compatible apps <usage-mobile_upload>` to "Share" the documents produced by these scanner apps with paperless.
+On Android, you can use these applications in combination with one of the :ref:`Paperless-ng compatible apps <usage-mobile_upload>` to "Share" the documents produced by these scanner apps with paperless. On iOS, you can share the scanned documents via iOS-Sharing to other mail, WebDav or FTP apps.
 
 .. _Office Lens: https://play.google.com/store/apps/details?id=com.microsoft.office.officelens
 .. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free
+.. _Quick Scan: https://apps.apple.com/us/app/quickscan-scanner-text-ocr/id1513790291
+.. _OpenScan: https://github.com/Ethereal-Developers-Inc/OpenScan
 
 .. _hannahswain: https://github.com/hannahswain
+.. _benjaminfrank: https://github.com/benjaminfrank

docs/usage_overview.rst

@@ -255,6 +255,8 @@ Here are a couple examples of tags and types that you could use in your collecti
 * A tag ``missing_metadata`` when you still need to add some metadata to a document, but can't
   or don't want to do this right now.
 
+.. _basic-usage_searching:
+
 Searching
 #########
 

install-paperless-ng.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 ask() {
 	while true ; do
 		if [[ -z $3 ]] ; then
@@ -64,6 +62,21 @@ if [[ -z $(which docker-compose) ]] ; then
 	exit 1
 fi
 
+# Check if user has permissions to run Docker by trying to get the status of Docker (docker status).
+# If this fails, the user probably does not have permissions for Docker.
+docker stats --no-stream 2>/dev/null 1>&2
+if [ $? -ne 0 ] ; then
+	echo ""
+	echo "WARN: It look like the current user does not have Docker permissions."
+	echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user."
+	echo ""
+	sleep 3
+fi
+
+default_time_zone=$(timedatectl show -p Timezone --value)
+
+set -e
+
 echo ""
 echo "############################################"
 echo "###   Paperless-ng docker installation   ###"
@@ -134,6 +147,15 @@ echo ""
 ask "Port" "8000"
 PORT=$ask_result
 
+echo ""
+echo "Paperless requires you to configure the current time zone correctly."
+echo "Otherwise, the dates of your documents may appear off by one day,"
+echo "depending on where you are on earth."
+echo ""
+
+ask "Current time zone" "$default_time_zone"
+TIME_ZONE=$ask_result
+
 echo ""
 echo "Database backend: PostgreSQL and SQLite are available. Use PostgreSQL"
 echo "if unsure. If you're running on a low-power device such as Raspberry"
@@ -269,6 +291,7 @@ DEFAULT_LANGUAGES="deu eng fra ita spa"
 	if [[ ! $USERMAP_GID == "1000" ]] ; then
 		echo "USERMAP_GID=$USERMAP_GID"
 	fi
+	echo "PAPERLESS_ZIME_ZONE=$TIME_ZONE"
 	echo "PAPERLESS_OCR_LANGUAGE=$OCR_LANGUAGE"
 	echo "PAPERLESS_SECRET_KEY=$SECRET_KEY"
 	if [[ ! " ${DEFAULT_LANGUAGES[@]} " =~ " ${OCR_LANGUAGE} " ]] ; then

requirements.txt

@@ -8,11 +8,11 @@
 -i https://pypi.python.org/simple
 --extra-index-url https://www.piwheels.org/simple
 aioredis==1.3.1
-arrow==1.0.1; python_version >= '3.6'
+arrow==1.0.3; python_version >= '3.6'
 asgiref==3.3.1; python_version >= '3.5'
 async-timeout==3.0.1; python_full_version >= '3.5.3'
 attrs==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-autobahn==21.2.2; python_version >= '3.7'
+autobahn==21.3.1; python_version >= '3.7'
 automat==20.2.0
 blessed==1.18.0
 certifi==2020.12.5
@@ -24,7 +24,7 @@ click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2,
 coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 concurrent-log-handler==0.9.19
 constantly==15.1.0
-cryptography==3.4.6
+cryptography==3.4.7
 daphne==3.0.1; python_version >= '3.6'
 dateparser==1.0.0
 django-cors-headers==3.7.0
@@ -33,48 +33,48 @@ django-filter==2.4.0
 django-picklefield==3.0.1; python_version >= '3'
 django-q==1.3.4
 django==3.1.7
-djangorestframework==3.12.2
+djangorestframework==3.12.4
 filelock==3.0.12
 fuzzywuzzy[speedup]==0.18.0
-gunicorn==20.0.4
+gunicorn==20.1.0
 h11==0.12.0; python_version >= '3.6'
-hiredis==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+hiredis==2.0.0; python_version >= '3.6'
 httptools==0.1.1
 humanfriendly==9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 hyperlink==21.0.0
 idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-imap-tools==0.38.1
+imap-tools==0.39.0
 img2pdf==0.4.0
-incremental==17.5.0
+incremental==21.3.0
 inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 inotifyrecursive==0.3.5
 joblib==1.0.1; python_version >= '3.6'
 langdetect==1.0.8
-lxml==4.6.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+lxml==4.6.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 msgpack==1.0.2
 numpy==1.19.5
-ocrmypdf==11.7.0
-pathvalidate==2.3.2
+ocrmypdf==11.7.3
+pathvalidate==2.4.0
 pdfminer.six==20201018
-pikepdf==2.5.2
-pillow==8.1.0
+pikepdf==2.10.0
+pillow==8.2.0
 pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-portalocker==2.2.1; python_version >= '3'
+portalocker==2.3.0; python_version >= '3'
 psycopg2-binary==2.8.6
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
 pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 pyopenssl==20.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 python-dateutil==2.8.1
-python-dotenv==0.15.0
-python-gnupg==0.4.6
+python-dotenv==0.16.0
+python-gnupg==0.4.7
 python-levenshtein==0.12.2
 python-magic==0.4.22
 pytz==2021.1
 pyyaml==5.4.1
 redis==3.5.3
-regex==2020.11.13
-reportlab==3.5.59
+regex==2021.3.17
+reportlab==3.5.66; python_version >= '2.7' and python_version < '4'
 requests==2.25.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 scikit-learn==0.24.0
 scipy==1.5.4
@@ -84,11 +84,11 @@ sortedcontainers==2.3.0
 sqlparse==0.4.1; python_version >= '3.5'
 threadpoolctl==2.1.0; python_version >= '3.5'
 tika==1.24
-tqdm==4.58.0
+tqdm==4.59.0
 twisted[tls]==21.2.0; python_full_version >= '3.5.4'
 txaio==21.2.1; python_version >= '3.6'
 tzlocal==2.1
-urllib3==1.26.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+urllib3==1.26.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
 uvicorn[standard]==0.13.4
 uvloop==0.14.0
 watchdog==1.0.2
@@ -97,4 +97,4 @@ wcwidth==0.2.5
 websockets==8.1
 whitenoise==5.2.0
 whoosh==2.7.4
-zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+zope.interface==5.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

src-ui/angular.json

@@ -16,13 +16,16 @@
 			"i18n": {
 				"sourceLocale": "en-US",
 				"locales": {
-					"de": "src/locale/messages.de.xlf",
+					"de-DE": "src/locale/messages.de_DE.xlf",
 					"nl-NL": "src/locale/messages.nl_NL.xlf",
-					"fr": "src/locale/messages.fr.xlf",
+					"fr-FR": "src/locale/messages.fr_FR.xlf",
 					"en-GB": "src/locale/messages.en_GB.xlf",
 					"pt-BR": "src/locale/messages.pt_BR.xlf",
-					"it": "src/locale/messages.it.xlf",
-					"ro": "src/locale/messages.ro.xlf"
+					"pt-PT": "src/locale/messages.pt_PT.xlf",
+					"it-IT": "src/locale/messages.it_IT.xlf",
+					"ro-RO": "src/locale/messages.ro_RO.xlf",
+					"ru-RU": "src/locale/messages.ru_RU.xlf",
+					"es-ES": "src/locale/messages.es_ES.xlf"
 				}
 			},
 			"architect": {
@@ -104,7 +107,8 @@
 				"extract-i18n": {
 					"builder": "@angular-devkit/build-angular:extract-i18n",
 					"options": {
-						"browserTarget": "paperless-ui:build"
+						"browserTarget": "paperless-ui:build",
+						"ivy": true
 					}
 				},
 				"test": {

src-ui/messages.xlf

@@ -48,21 +48,21 @@
         <source>Documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>&quot; saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6837554170707123455" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="savedView.name"/>&quot; created successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9ca82952a6bc860b5391d5975322d8af8ceddfa4" datatype="html">
@@ -146,77 +146,77 @@
         <source>ASN</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7b5c6286aaded63fb279d6deb8aa8c704e085ced" datatype="html">
         <source>Correspondent</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e" datatype="html">
         <source>Title</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2bd5919e8098513664a89d5b7b52d61e3063950f" datatype="html">
         <source>Document type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1b051734b0ee9021991c91b3ed4e81c244322462" datatype="html">
         <source>Created</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="80e3b490720757978c99a7b5af3885faf202b955" datatype="html">
         <source>Added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9021887951960049161" datatype="html">
         <source>Confirm delete</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">203</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5382975254277698192" datatype="html">
         <source>Do you really want to delete document &quot;<x id="PH" equiv-text="this.document.title"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">204</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6691075929777935948" datatype="html">
         <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">205</context>
+          <context context-type="linenumber">206</context>
         </context-group>
       </trans-unit>
       <trans-unit id="719892092227206532" datatype="html">
         <source>Delete document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">207</context>
+          <context context-type="linenumber">208</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1844801255494293730" datatype="html">
         <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">214</context>
+          <context context-type="linenumber">215</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
@@ -912,48 +912,6 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="49c9ede51100b454f7841b24cd02355c6622bf44" datatype="html">
-        <source>Search results</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="31976d04f98e8a38098f66ac3a83ad33b576e5db" datatype="html">
-        <source>Invalid search query: <x id="INTERPOLATION" equiv-text="{{errorMessage}}"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e" datatype="html">
-        <source> Showing documents similar to <x id="START_LINK" equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}"/><x id="INTERPOLATION" equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;"/><x id="CLOSE_LINK" equiv-text="&lt;/a&gt;"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e" datatype="html">
-        <source>Search query: <x id="START_ITALIC_TEXT" equiv-text="&lt;i&gt;{{query}}"/><x id="INTERPOLATION" equiv-text="{{query}}&lt;/i&gt;"/><x id="CLOSE_ITALIC_TEXT" equiv-text="&lt;/i&gt;"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="afa760e48c97d64d19c1455d18b7834a2256e23f" datatype="html">
-        <source>Did you mean &quot;<x id="START_LINK" equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}"/><x id="INTERPOLATION" equiv-text="{{correctedQuery}}&lt;/a&gt;"/><x id="CLOSE_LINK" equiv-text="&lt;/a&gt;"/>&quot;?</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e" datatype="html">
-        <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="41147374f427980a9f1a8cd5e3f4b1666e6f2418" datatype="html">
         <source>Paperless-ng</source>
         <context-group purpose="location">
@@ -1039,67 +997,95 @@
           <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5701618810648052610" datatype="html">
-        <source>Title</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="3100631071441658964" datatype="html">
-        <source>Title &amp; content</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">74</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="5195932016807797291" datatype="html">
         <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find(c =&gt; c.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8170755470576301659" datatype="html">
         <source>Without correspondent</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705701325879965907" datatype="html">
         <source>Type: <x id="PH" equiv-text="this.documentTypes.find(dt =&gt; dt.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4362173610367509215" datatype="html">
         <source>Without document type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8180755793012580465" datatype="html">
         <source>Tag: <x id="PH" equiv-text="this.tags.find(t =&gt; t.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6494566478302448576" datatype="html">
         <source>Without any tag</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6523384805359286307" datatype="html">
         <source>Title: <x id="PH" equiv-text="rule.value"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1872523635812236432" datatype="html">
+        <source>ASN: <x id="PH" equiv-text="rule.value"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5701618810648052610" datatype="html">
+        <source>Title</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3100631071441658964" datatype="html">
+        <source>Title &amp; content</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7517688192215738656" datatype="html">
+        <source>ASN</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1010505078885609376" datatype="html">
+        <source>Advanced search</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2649431021108393503" datatype="html">
+        <source>More like</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+          <context context-type="linenumber">91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="02d184c288f567825a1fcbf83bcd3099a10853d5" datatype="html">
@@ -1198,14 +1184,7 @@
         <source>View</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
-          <context context-type="linenumber">50</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="849b42384616374df49bd8b3711ec159cb10b845" datatype="html">
-        <source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
@@ -1226,14 +1205,28 @@
         <source>Score:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2840db547019ce8c76b2cdbe3a1653c5b68b06af" datatype="html">
-        <source>View in browser</source>
+      <trans-unit id="727d980bba2b3e0b3d8705607f1208eef046479b" datatype="html">
+        <source>Created: <x id="INTERPOLATION" equiv-text="{{ document.created | customDate}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0f5d856cb63c69fde44fbfc653ec0655f9040865" datatype="html">
+        <source>Added: <x id="INTERPOLATION" equiv-text="{{ document.added | customDate}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a205126adef6251fc63305f1a6228d07bc2795a8" datatype="html">
+        <source>Modified: <x id="INTERPOLATION" equiv-text="{{ document.modified | customDate}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7985804062689412812" datatype="html">
@@ -1626,6 +1619,13 @@
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="bd5ca454e336126f3eeb67417d9264696b5c852c" datatype="html">
+        <source>Searching document with asn <x id="INTERPOLATION" equiv-text="{{asn}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-asn/document-asn.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2807800733729323332" datatype="html">
         <source>Yes</source>
         <context-group purpose="location">
@@ -1682,32 +1682,53 @@
           <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="153799456510623899" datatype="html">
+        <source>Portuguese</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="9184513005098760425" datatype="html">
         <source>Portuguese (Brazil)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">96</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2935232983274991580" datatype="html">
         <source>Italian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">96</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8118856427047826368" datatype="html">
         <source>Romanian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7137419789978325708" datatype="html">
+        <source>Russian</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5190825892106392539" datatype="html">
+        <source>Spanish</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">100</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4912706592792948707" datatype="html">
         <source>ISO 8601</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">102</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2119857572761283468" datatype="html">
@@ -1819,13 +1840,6 @@
           <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7517688192215738656" datatype="html">
-        <source>ASN</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="2691296884221415710" datatype="html">
         <source>Correspondent</source>
         <context-group purpose="location">

src-ui/src/app/app-routing.module.ts

@@ -10,7 +10,7 @@ import { LogsComponent } from './components/manage/logs/logs.component';
 import { SettingsComponent } from './components/manage/settings/settings.component';
 import { TagListComponent } from './components/manage/tag-list/tag-list.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
-import { SearchComponent } from './components/search/search.component';
+import {DocumentAsnComponent} from "./components/document-asn/document-asn.component";
 
 const routes: Routes = [
   {path: '', redirectTo: 'dashboard', pathMatch: 'full'},
@@ -18,15 +18,15 @@ const routes: Routes = [
     {path: 'dashboard', component: DashboardComponent },
     {path: 'documents', component: DocumentListComponent },
     {path: 'view/:id', component: DocumentListComponent },
-    {path: 'search', component: SearchComponent },
     {path: 'documents/:id', component: DocumentDetailComponent },
-  
+      {path: 'asn/:id', component: DocumentAsnComponent },
+
     {path: 'tags', component: TagListComponent },
     {path: 'documenttypes', component: DocumentTypeListComponent },
     {path: 'correspondents', component: CorrespondentListComponent },
     {path: 'logs', component: LogsComponent },
     {path: 'settings', component: SettingsComponent },
-  ]}, 
+  ]},
 
   {path: '404', component: NotFoundComponent},
   {path: '**', redirectTo: '/404', pathMatch: 'full'}

src-ui/src/app/app.module.ts

@@ -21,8 +21,6 @@ import { CorrespondentEditDialogComponent } from './components/manage/correspond
 import { TagEditDialogComponent } from './components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component';
 import { DocumentTypeEditDialogComponent } from './components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component';
 import { TagComponent } from './components/common/tag/tag.component';
-import { SearchComponent } from './components/search/search.component';
-import { ResultHighlightComponent } from './components/search/result-highlight/result-highlight.component';
 import { PageHeaderComponent } from './components/common/page-header/page-header.component';
 import { AppFrameComponent } from './components/app-frame/app-frame.component';
 import { ToastsComponent } from './components/common/toasts/toasts.component';
@@ -73,15 +71,21 @@ import localePt from '@angular/common/locales/pt';
 import localeIt from '@angular/common/locales/it';
 import localeEnGb from '@angular/common/locales/en-GB';
 import localeRo from '@angular/common/locales/ro';
+import localeRu from '@angular/common/locales/ru';
+import localeEs from '@angular/common/locales/es';
+import { DocumentAsnComponent } from './components/document-asn/document-asn.component';
 
 
 registerLocaleData(localeFr)
 registerLocaleData(localeNl)
 registerLocaleData(localeDe)
 registerLocaleData(localePt, "pt-BR")
+registerLocaleData(localePt, "pt-PT")
 registerLocaleData(localeIt)
 registerLocaleData(localeEnGb)
 registerLocaleData(localeRo)
+registerLocaleData(localeRu)
+registerLocaleData(localeEs)
 
 @NgModule({
   declarations: [
@@ -100,8 +104,6 @@ registerLocaleData(localeRo)
     TagEditDialogComponent,
     DocumentTypeEditDialogComponent,
     TagComponent,
-    SearchComponent,
-    ResultHighlightComponent,
     PageHeaderComponent,
     AppFrameComponent,
     ToastsComponent,
@@ -133,7 +135,8 @@ registerLocaleData(localeRo)
     SafePipe,
     CustomDatePipe,
     DateComponent,
-    ColorComponent
+    ColorComponent,
+    DocumentAsnComponent
   ],
   imports: [
     BrowserModule,

src-ui/src/app/components/app-frame/app-frame.component.html

@@ -5,7 +5,7 @@
     <span class="navbar-toggler-icon"></span>
   </button>
   <a class="navbar-brand col-auto col-md-3 col-lg-2 mr-0 px-3 py-3 order-sm-0" routerLink="/dashboard">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1rem" class="mr-2" fill="currentColor">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1em" class="mr-2" fill="currentColor">
       <path d="M194.7,0C164.22,70.94,17.64,79.74,64.55,194.06c.58,1.47-10.85,17-18.47,29.9-1.76-6.45-3.81-13.48-3.52-14.07,38.11-45.14-27.26-70.65-30.78-107.58C-4.64,131.62-10.5,182.92,39,212.53c.3,0,2.64,11.14,3.81,16.71a58.55,58.55,0,0,0-2.93,6.45c-1.17,2.93,7.62,2.64,7.62,3.22.88-.29,21.7-36.93,22.28-37.23C187.67,174.72,208.48,68.6,194.7,0ZM134.61,74.75C79.5,124,70.12,160.64,71.88,178.53,53.41,134.85,107.64,86.77,134.61,74.75ZM28.2,145.11c10.55,9.67,28.14,39.28,13.19,56.57C44.91,193.77,46.08,175.89,28.2,145.11Z" transform="translate(0 0)"/>
     </svg>
     <ng-container i18n="app title">Paperless-ng</ng-container>
@@ -31,7 +31,7 @@
       </button>
       <div ngbDropdownMenu class="dropdown-menu-right shadow mr-2" aria-labelledby="userDropdown">
         <div *ngIf="displayName" class="d-sm-none">
-          <p class="small mb-0 px-3" i18n>Logged in as {{displayName}}</p>
+          <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{displayName}}</p>
           <div class="dropdown-divider"></div>
         </div>
         <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()">
@@ -175,7 +175,7 @@
                 </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
               </a>
               <a class="nav-link-additional small text-muted ml-3" target="_blank" rel="noopener noreferrer" href="https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests" title="Suggest an idea">
-                <svg xmlns="http://www.w3.org/2000/svg" width=".9rem" height=".9rem" fill="currentColor" class="bi bi-lightbulb pr-1" viewBox="0 0 16 16">
+                <svg xmlns="http://www.w3.org/2000/svg" width="1.3em" height="1.3em" fill="currentColor" class="bi bi-lightbulb pr-1" viewBox="0 0 16 16">
                   <path d="M2 6a6 6 0 1 1 10.174 4.31c-.203.196-.359.4-.453.619l-.762 1.769A.5.5 0 0 1 10.5 13a.5.5 0 0 1 0 1 .5.5 0 0 1 0 1l-.224.447a1 1 0 0 1-.894.553H6.618a1 1 0 0 1-.894-.553L5.5 15a.5.5 0 0 1 0-1 .5.5 0 0 1 0-1 .5.5 0 0 1-.46-.302l-.761-1.77a1.964 1.964 0 0 0-.453-.618A5.984 5.984 0 0 1 2 6zm6-5a5 5 0 0 0-3.479 8.592c.263.254.514.564.676.941L5.83 12h4.342l.632-1.467c.162-.377.413-.687.676-.941A5 5 0 0 0 8 1z"/>
                 </svg>
                 <ng-container i18n>Suggest an idea</ng-container>

src-ui/src/app/components/app-frame/app-frame.component.ts

@@ -10,6 +10,8 @@ import { SearchService } from 'src/app/services/rest/search.service';
 import { environment } from 'src/environments/environment';
 import { DocumentDetailComponent } from '../document-detail/document-detail.component';
 import { Meta } from '@angular/platform-browser';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+import { FILTER_FULLTEXT_QUERY } from 'src/app/data/filter-rule-type';
 
 @Component({
   selector: 'app-app-frame',
@@ -24,6 +26,7 @@ export class AppFrameComponent implements OnInit {
     private openDocumentsService: OpenDocumentsService,
     private searchService: SearchService,
     public savedViewService: SavedViewService,
+    private list: DocumentListViewService,
     private meta: Meta
     ) {
 
@@ -74,7 +77,7 @@ export class AppFrameComponent implements OnInit {
 
   search() {
     this.closeMenu()
-    this.router.navigate(['search'], {queryParams: {query: this.searchField.value}})
+    this.list.quickFilter([{rule_type: FILTER_FULLTEXT_QUERY, value: this.searchField.value}])
   }
 
   closeDocument(d: PaperlessDocument) {

src-ui/src/app/components/common/input/select/select.component.html

@@ -1,33 +1,36 @@
 <div class="form-group paperless-input-select">
   <label [for]="inputId">{{title}}</label>
-  <div [class.input-group]="showPlusButton()">
-    <ng-select name="inputId" [(ngModel)]="value"
-      [disabled]="disabled"
-      [style.color]="textColor"
-      [style.background]="backgroundColor"
-      [clearable]="allowNull"
-      [items]="items"
-      bindLabel="name"
-      bindValue="id"
-      (change)="onChange(value)"
-      (blur)="onTouched()">
-    </ng-select>
-
-    <div *ngIf="showPlusButton()" class="input-group-append">
-      <button class="btn btn-outline-secondary" type="button" (click)="createNew.emit()">
-        <svg class="buttonicon" fill="currentColor">
-          <use xlink:href="assets/bootstrap-icons.svg#plus" />
-        </svg>
-      </button>
+    <div [class.input-group]="allowCreateNew">
+      <ng-select name="inputId" [(ngModel)]="value"
+        [disabled]="disabled"
+        [style.color]="textColor"
+        [style.background]="backgroundColor"
+        [clearable]="allowNull"
+        [items]="items"
+        [addTag]="allowCreateNew && addItemRef"
+        bindLabel="name"
+        bindValue="id"
+        (change)="onChange(value)"
+        (search)="onSearch($event)"
+        (focus)="clearLastSearchTerm()"
+        (clear)="clearLastSearchTerm()"
+        (blur)="onBlur()">
+      </ng-select>
+      <div *ngIf="allowCreateNew" class="input-group-append">
+        <button class="btn btn-outline-secondary" type="button" (click)="addItem()">
+          <svg class="buttonicon" fill="currentColor">
+            <use xlink:href="assets/bootstrap-icons.svg#plus" />
+          </svg>
+        </button>
+      </div>
     </div>
-  </div>
   <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
   <small *ngIf="getSuggestions().length > 0">
     <span i18n>Suggestions:</span>&nbsp;
     <ng-container *ngFor="let s of getSuggestions()">
       <a (click)="value = s.id; onChange(value)" [routerLink]="">{{s.name}}</a>&nbsp;
     </ng-container>
-    
-    
+
+
   </small>
 </div>

src-ui/src/app/components/common/input/select/select.component.ts

@@ -16,6 +16,7 @@ export class SelectComponent extends AbstractInputComponent<number> {
 
   constructor() {
     super()
+    this.addItemRef = this.addItem.bind(this)
    }
 
   @Input()
@@ -34,9 +35,13 @@ export class SelectComponent extends AbstractInputComponent<number> {
   suggestions: number[]
 
   @Output()
-  createNew = new EventEmitter()
+  createNew = new EventEmitter<string>()
 
-  showPlusButton(): boolean {
+  public addItemRef: (name) => void
+
+  private _lastSearchTerm: string
+
+  get allowCreateNew(): boolean {
     return this.createNew.observers.length > 0
   }
 
@@ -48,4 +53,29 @@ export class SelectComponent extends AbstractInputComponent<number> {
     }
   }
 
+  addItem(name: string) {
+    if (name) this.createNew.next(name)
+    else this.createNew.next(this._lastSearchTerm)
+    this.clearLastSearchTerm()
+  }
+
+  clickNew() {
+    this.createNew.next(this._lastSearchTerm)
+    this.clearLastSearchTerm()
+  }
+
+  clearLastSearchTerm() {
+    this._lastSearchTerm = null
+  }
+
+  onSearch($event) {
+    this._lastSearchTerm = $event.term
+  }
+
+  onBlur() {
+    setTimeout(() => {
+      this.clearLastSearchTerm()
+    }, 3000);
+  }
+
 }

src-ui/src/app/components/common/input/tags/tags.component.html

@@ -7,8 +7,13 @@
       [closeOnSelect]="false"
       [clearSearchOnAdd]="true"
       [hideSelected]="true"
+      [addTag]="createTagRef"
+      addTagText="Add tag"
       (change)="onChange(value)"
-      (blur)="onTouched()">
+      (search)="onSearch($event)"
+      (focus)="clearLastSearchTerm()"
+      (clear)="clearLastSearchTerm()"
+      (blur)="onBlur()">
 
       <ng-template ng-label-tmp let-item="item">
         <span class="tag-wrap tag-wrap-delete" (click)="removeTag(item.id)">
@@ -39,8 +44,8 @@
     <ng-container *ngFor="let tag of getSuggestions()">
       <a (click)="addTag(tag.id)" [routerLink]="">{{tag.name}}</a>&nbsp;
     </ng-container>
-    
-    
+
+
   </small>
 
 </div>

src-ui/src/app/components/common/input/tags/tags.component.ts

@@ -17,8 +17,9 @@ import { TagService } from 'src/app/services/rest/tag.service';
 })
 export class TagsComponent implements OnInit, ControlValueAccessor {
 
-  constructor(private tagService: TagService, private modalService: NgbModal) { }
-
+  constructor(private tagService: TagService, private modalService: NgbModal) {
+    this.createTagRef = this.createTag.bind(this)
+  }
 
   onChange = (newValue: number[]) => {};
 
@@ -56,6 +57,10 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
 
   tags: PaperlessTag[]
 
+  public createTagRef: (name) => void
+
+  private _lastSearchTerm: string
+
   getTag(id) {
     if (this.tags) {
       return this.tags.find(tag => tag.id == id)
@@ -74,9 +79,11 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  createTag() {
+  createTag(name: string = null) {
     var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
+    if (name) modal.componentInstance.object = { name: name }
+    else if (this._lastSearchTerm) modal.componentInstance.object = { name: this._lastSearchTerm }
     modal.componentInstance.success.subscribe(newTag => {
       this.tagService.listAll().subscribe(tags => {
         this.tags = tags.results
@@ -99,4 +106,18 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
     this.onChange(this.value)
   }
 
+  clearLastSearchTerm() {
+    this._lastSearchTerm = null
+  }
+
+  onSearch($event) {
+    this._lastSearchTerm = $event.term
+  }
+
+  onBlur() {
+    setTimeout(() => {
+      this.clearLastSearchTerm()
+    }, 3000);
+  }
+
 }

src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss

@@ -23,7 +23,7 @@ form {
   }
 }
 
-::ng-deep .progress {
+.progress {
   position: absolute;
   top: 0;
   right: 0;

src-ui/src/app/components/document-asn/document-asn.component.html

@@ -0,0 +1 @@
+<p i18n>Searching document with asn {{asn}}</p>

src-ui/src/app/components/document-asn/document-asn.component.spec.ts

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SearchComponent } from './search.component';
+import { DocumentAsnComponent } from './document-asn.component';
 
-describe('SearchComponent', () => {
-  let component: SearchComponent;
-  let fixture: ComponentFixture<SearchComponent>;
+describe('DocumentASNComponentComponent', () => {
+  let component: DocumentAsnComponent;
+  let fixture: ComponentFixture<DocumentAsnComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ SearchComponent ]
+      declarations: [ DocumentAsnComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SearchComponent);
+    fixture = TestBed.createComponent(DocumentAsnComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src-ui/src/app/components/document-asn/document-asn.component.ts

@@ -0,0 +1,34 @@
+import { Component, OnInit } from '@angular/core';
+import {DocumentService} from "../../services/rest/document.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {FILTER_ASN} from "../../data/filter-rule-type";
+
+@Component({
+  selector: 'app-document-asncomponent',
+  templateUrl: './document-asn.component.html',
+  styleUrls: ['./document-asn.component.scss']
+})
+export class DocumentAsnComponent implements OnInit {
+
+  asn: string
+  constructor(
+    private documentsService: DocumentService,
+    private route: ActivatedRoute,
+    private router: Router) { }
+
+
+  ngOnInit(): void {
+
+    this.route.paramMap.subscribe(paramMap => {
+      this.asn = paramMap.get('id');
+      this.documentsService.listAllFilteredIds([{rule_type: FILTER_ASN, value: this.asn}]).subscribe(documentId => {
+        if (documentId.length == 1) {
+          this.router.navigate(['documents', documentId[0]])
+        } else {
+          this.router.navigate(['404'])
+        }
+      })
+    })
+
+  }
+}

src-ui/src/app/components/document-detail/document-detail.component.html

@@ -60,9 +60,9 @@
                         <app-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" formControlName='archive_serial_number'></app-input-number>
                         <app-input-date i18n-title title="Date created" formControlName="created" [error]="error?.created"></app-input-date>
                         <app-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true"
-                            (createNew)="createCorrespondent()" [suggestions]="suggestions?.correspondents"></app-input-select>
+                            (createNew)="createCorrespondent($event)" [suggestions]="suggestions?.correspondents"></app-input-select>
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
-                            (createNew)="createDocumentType()" [suggestions]="suggestions?.document_types"></app-input-select>
+                            (createNew)="createDocumentType($event)" [suggestions]="suggestions?.document_types"></app-input-select>
                         <app-input-tags formControlName="tags" [suggestions]="suggestions?.tags"></app-input-tags>
 
                     </ng-template>

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -20,6 +20,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { TextComponent } from '../common/input/text/text.component';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions';
+import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type';
 
 @Component({
   selector: 'app-document-detail',
@@ -127,9 +128,10 @@ export class DocumentDetailComponent implements OnInit {
     this.documentForm.patchValue(doc)
   }
 
-  createDocumentType() {
+  createDocumentType(newName: string) {
     var modal = this.modalService.open(DocumentTypeEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
+    if (newName) modal.componentInstance.object = { name: newName }
     modal.componentInstance.success.subscribe(newDocumentType => {
       this.documentTypeService.listAll().subscribe(documentTypes => {
         this.documentTypes = documentTypes.results
@@ -138,9 +140,10 @@ export class DocumentDetailComponent implements OnInit {
     })
   }
 
-  createCorrespondent() {
+  createCorrespondent(newName: string) {
     var modal = this.modalService.open(CorrespondentEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
+    if (newName) modal.componentInstance.object = { name: newName }
     modal.componentInstance.success.subscribe(newCorrespondent => {
       this.correspondentService.listAll().subscribe(correspondents => {
         this.correspondents = correspondents.results
@@ -219,7 +222,7 @@ export class DocumentDetailComponent implements OnInit {
   }
 
   moreLike() {
-    this.router.navigate(["search"], {queryParams: {more_like:this.document.id}})
+    this.documentListViewService.quickFilter([{rule_type: FILTER_FULLTEXT_MORELIKE, value: this.documentId.toString()}])
   }
 
   hasNext() {

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html

@@ -1,4 +1,4 @@
-<div class="card mb-3 shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
+<div class="card mb-3 shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable" [class.popover-hidden]="popoverHidden" (mouseleave)="mouseLeaveCard()">
   <div class="row no-gutters">
     <div class="col-md-2 d-none d-lg-block doc-img-background rounded-left" [class.doc-img-background-selected]="selected" (click)="this.toggleSelected.emit($event)">
       <img [src]="getThumbUrl()" class="card-img doc-img border-right rounded-left" [class.inverted]="getIsThumbInverted()">
@@ -23,17 +23,16 @@
             {{document.title | documentTitle}}
             <app-tag [tag]="t" linkTitle="Filter by tag" i18n-linkTitle *ngFor="let t of document.tags$ | async" class="ml-1" (click)="clickTag.emit(t.id);$event.stopPropagation()" [clickable]="clickTag.observers.length"></app-tag>
           </h5>
-          <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
         </div>
         <p class="card-text">
-          <app-result-highlight *ngIf="getDetailsAsHighlight()" class="result-content" [highlights]="getDetailsAsHighlight()"></app-result-highlight>
-          <span *ngIf="getDetailsAsString()" class="result-content">{{getDetailsAsString()}}</span>
+          <span *ngIf="document.__search_hit__" [innerHtml]="document.__search_hit__.highlights"></span>
+          <span *ngIf="!document.__search_hit__" class="result-content">{{contentTrimmed}}</span>
         </p>
 
 
         <div class="d-flex flex-column flex-md-row align-items-md-center">
           <div class="btn-group">
-            <a routerLink="/search" [queryParams]="{'more_like': document.id}" class="btn btn-sm btn-outline-secondary" *ngIf="moreLikeThis">
+            <a class="btn btn-sm btn-outline-secondary" (click)="clickMoreLike.emit()">
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-three-dots" viewBox="0 0 16 16">
                 <path fill-rule="evenodd" d="M3 9.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
               </svg>&nbsp;<span class="d-block d-md-inline" i18n>More like this</span>
@@ -43,28 +42,51 @@
                 <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
               </svg>&nbsp;<span class="d-block d-md-inline" i18n>Edit</span>
             </a>
-            <a class="btn btn-sm btn-outline-secondary" [href]="getPreviewUrl()">
+            <a class="btn btn-sm btn-outline-secondary" [href]="previewUrl"
+            [ngbPopover]="previewContent" [popoverTitle]="document.title | documentTitle"
+            autoClose="true" popoverClass="shadow" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()" #popover="ngbPopover">
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16">
                 <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
                 <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
               </svg>&nbsp;<span class="d-block d-md-inline" i18n>View</span>
             </a>
+            <ng-template #previewContent>
+              <object [data]="previewUrl | safe" class="preview" width="100%"></object>
+            </ng-template>
             <a class="btn btn-sm btn-outline-secondary" [href]="getDownloadUrl()">
               <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
                 <path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
               </svg>&nbsp;<span class="d-block d-md-inline" i18n>Download</span>
             </a>
-
           </div>
 
-          <div *ngIf="searchScore" class="d-flex align-items-center ml-md-auto mt-2 mt-md-0">
-            <small class="text-muted" i18n>Score:</small>
-
-            <ngb-progressbar [type]="searchScoreClass" [value]="searchScore" class="search-score-bar mx-2" [max]="1"></ngb-progressbar>
+          <div class="list-group list-group-horizontal border-0 card-info ml-md-auto mt-2 mt-md-0">
+            <button *ngIf="document.document_type" type="button" class="list-group-item btn btn-sm bg-light text-dark p-1 border-0 mr-2" title="Filter by document type"
+             (click)="clickDocumentType.emit(document.document_type);$event.stopPropagation()">
+              <svg class="metadata-icon mr-2 text-muted bi bi-file-earmark" viewBox="0 0 16 16" fill="currentColor">
+                <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+              </svg>
+              <small>{{(document.document_type$ | async)?.name}}</small>
+            </button>
+            <div *ngIf="document.archive_serial_number" class="list-group-item mr-2 bg-light text-dark p-1 border-0">
+              <svg class="metadata-icon mr-2 text-muted bi bi-upc-scan" viewBox="0 0 16 16" fill="currentColor">
+                <path d="M1.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 0 1-1 0v-3A1.5 1.5 0 0 1 1.5 0h3a.5.5 0 0 1 0 1h-3zM11 .5a.5.5 0 0 1 .5-.5h3A1.5 1.5 0 0 1 16 1.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 1-.5-.5zM.5 11a.5.5 0 0 1 .5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 1 0 1h-3A1.5 1.5 0 0 1 0 14.5v-3a.5.5 0 0 1 .5-.5zm15 0a.5.5 0 0 1 .5.5v3a1.5 1.5 0 0 1-1.5 1.5h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 1 .5-.5zM3 4.5a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-7zm3 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7z"/>
+              </svg>
+              <small>#{{document.archive_serial_number}}</small>
+            </div>
+            <div class="list-group-item bg-light text-dark p-1 border-0" ngbTooltip="Added:&nbsp;{{document.added | customDate:'shortDate'}} Created:&nbsp;{{document.created | customDate:'shortDate'}}">
+              <svg class="metadata-icon mr-2 text-muted bi bi-calendar-event" viewBox="0 0 16 16" fill="currentColor">
+                <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z"/>
+                <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z"/>
+              </svg>
+              <small>{{document.created | customDate:'mediumDate'}}</small>
+            </div>
+            <div *ngIf="document.__search_hit__" class="list-group-item bg-light text-dark border-0 d-flex search-score">
+              <small class="text-muted" i18n>Score:</small>
+              <ngb-progressbar [type]="searchScoreClass" [value]="document.__search_hit__.score" class="search-score-bar mx-2 mt-1" [max]="1"></ngb-progressbar>
+            </div>
           </div>
-
-          <small class="text-muted" [class.ml-auto]="!searchScore" i18n>Created: {{document.created | customDate}}</small>
         </div>
 
       </div>

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss

@@ -37,3 +37,31 @@
 .doc-img-background-selected {
   background-color: $primaryFaded;
 }
+
+.card-info {
+  line-height: 1;
+
+  button {
+    line-height: 1;
+
+    &:hover,
+    &:focus {
+      background-color: transparent !important;
+    }
+  }
+
+  .metadata-icon {
+    width: 0.9rem;
+    height: 0.9rem;
+    padding: 0.05rem;
+  }
+
+  .search-score {
+    padding-top: 0.35rem !important;
+  }
+}
+
+span ::ng-deep .match {
+  color: black;
+  background-color: rgb(255, 211, 66);
+}

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts

@@ -1,13 +1,16 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { DocumentService } from 'src/app/services/rest/document.service';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type';
 
 @Component({
   selector: 'app-document-card-large',
   templateUrl: './document-card-large.component.html',
-  styleUrls: ['./document-card-large.component.scss']
+  styleUrls: ['./document-card-large.component.scss', '../popover-preview/popover-preview.scss']
 })
 export class DocumentCardLargeComponent implements OnInit {
 
@@ -23,31 +26,35 @@ export class DocumentCardLargeComponent implements OnInit {
     return this.toggleSelected.observers.length > 0
   }
 
-  @Input()
-  moreLikeThis: boolean = false
-
   @Input()
   document: PaperlessDocument
 
-  @Input()
-  details: any
-
   @Output()
   clickTag = new EventEmitter<number>()
 
   @Output()
   clickCorrespondent = new EventEmitter<number>()
 
-  @Input()
-  searchScore: number
+  @Output()
+  clickDocumentType = new EventEmitter<number>()
+
+  @Output()
+  clickMoreLike= new EventEmitter()
+
+  @ViewChild('popover') popover: NgbPopover
+
+  mouseOnPreview = false
+  popoverHidden = true
 
   get searchScoreClass() {
-    if (this.searchScore > 0.7) {
-      return "success"
-    } else if (this.searchScore > 0.3) {
-      return "warning"
-    } else {
-      return "danger"
+    if (this.document.__search_hit__) {
+      if (this.document.__search_hit__.score > 0.7) {
+        return "success"
+      } else if (this.document.__search_hit__.score > 0.3) {
+        return "warning"
+      } else {
+        return "danger"
+      }
     }
   }
 
@@ -58,19 +65,6 @@ export class DocumentCardLargeComponent implements OnInit {
     return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED)
   }
 
-  getDetailsAsString() {
-    if (typeof this.details === 'string') {
-      return this.details.substring(0, 500)
-    }
-  }
-
-  getDetailsAsHighlight() {
-    //TODO: this is not an exact typecheck, can we do better
-    if (this.details instanceof Array) {
-      return this.details
-    }
-  }
-
   getThumbUrl() {
     return this.documentService.getThumbUrl(this.document.id)
   }
@@ -79,7 +73,36 @@ export class DocumentCardLargeComponent implements OnInit {
     return this.documentService.getDownloadUrl(this.document.id)
   }
 
-  getPreviewUrl() {
+  get previewUrl() {
     return this.documentService.getPreviewUrl(this.document.id)
   }
+
+  mouseEnterPreview() {
+    this.mouseOnPreview = true
+    if (!this.popover.isOpen()) {
+      // we're going to open but hide to pre-load content during hover delay
+      this.popover.open()
+      this.popoverHidden = true
+      setTimeout(() => {
+        if (this.mouseOnPreview) {
+          // show popover
+          this.popoverHidden = false
+        } else {
+          this.popover.close()
+        }
+      }, 600);
+    }
+  }
+
+  mouseLeavePreview() {
+    this.mouseOnPreview = false
+  }
+
+  mouseLeaveCard() {
+    this.popover.close()
+  }
+
+  get contentTrimmed() {
+    return this.document.content.substr(0, 500)
+  }
 }

src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html

@@ -1,5 +1,5 @@
 <div class="col p-2 h-100">
-  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected">
+  <div class="card h-100 shadow-sm document-card" [class.card-selected]="selected" [class.popover-hidden]="popoverHidden" (mouseleave)="mouseLeaveCard()">
     <div class="border-bottom doc-img-container" [class.doc-img-background-selected]="selected" (click)="this.toggleSelected.emit($event)">
       <img class="card-img doc-img rounded-top" [class.inverted]="getIsThumbInverted()" [src]="getThumbUrl()">
 
@@ -25,24 +25,60 @@
         <ng-container *ngIf="document.correspondent">
           <a [routerLink]="" title="Filter by correspondent" i18n-title (click)="clickCorrespondent.emit(document.correspondent);$event.stopPropagation()" class="font-weight-bold">{{(document.correspondent$ | async)?.name}}</a>:
         </ng-container>
-        {{document.title | documentTitle}} <span *ngIf="document.archive_serial_number">(#{{document.archive_serial_number}})</span>
+        {{document.title | documentTitle}}
       </p>
     </div>
-    <div class="card-footer">
+    <div class="card-footer pt-0 pb-2 px-2">
+      <div class="list-group list-group-flush border-0 pt-1 pb-2 card-info">
+        <button *ngIf="document.document_type" type="button" class="list-group-item list-group-item-action bg-transparent pl-0 p-1 border-0" title="Filter by document type"
+         (click)="clickDocumentType.emit(document.document_type);$event.stopPropagation()">
+          <svg class="metadata-icon mr-2 text-muted bi bi-file-earmark" viewBox="0 0 16 16" fill="currentColor">
+            <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+          </svg>
+          <small>{{(document.document_type$ | async)?.name}}</small>
+        </button>
+        <div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
+          <ng-template #dateTooltip>
+            <div class="d-flex flex-column">
+              <span i18n>Created: {{ document.created | customDate}}</span>
+              <span i18n>Added: {{ document.added | customDate}}</span>
+              <span i18n>Modified: {{ document.modified | customDate}}</span>
+            </div>
+          </ng-template>
 
-      <div class="d-flex justify-content-between align-items-center mx-n2">
-        <div class="btn-group">
+          <div class="pl-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
+            <svg class="metadata-icon mr-2 text-muted bi bi-calendar-event" viewBox="0 0 16 16" fill="currentColor">
+              <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z"/>
+              <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z"/>
+            </svg>
+            <small>{{document.created | customDate:'mediumDate'}}</small>
+          </div>
+          <div *ngIf="document.archive_serial_number" class="pl-0 p-1">
+            <svg class="metadata-icon mr-2 text-muted bi bi-upc-scan" viewBox="0 0 16 16" fill="currentColor">
+              <path d="M1.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 0 1-1 0v-3A1.5 1.5 0 0 1 1.5 0h3a.5.5 0 0 1 0 1h-3zM11 .5a.5.5 0 0 1 .5-.5h3A1.5 1.5 0 0 1 16 1.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 1-.5-.5zM.5 11a.5.5 0 0 1 .5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 1 0 1h-3A1.5 1.5 0 0 1 0 14.5v-3a.5.5 0 0 1 .5-.5zm15 0a.5.5 0 0 1 .5.5v3a1.5 1.5 0 0 1-1.5 1.5h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 1 .5-.5zM3 4.5a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-7zm3 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7z"/>
+            </svg>
+            <small>#{{document.archive_serial_number}}</small>
+          </div>
+        </div>
+      </div>
+      <div class="d-flex justify-content-between align-items-center">
+        <div class="btn-group w-100">
           <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary" title="Edit" i18n-title>
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
             </svg>
           </a>
-          <a [href]="getPreviewUrl()" class="btn btn-sm btn-outline-secondary" title="View in browser" i18n-title>
+          <a [href]="previewUrl" target="_blank" class="btn btn-sm btn-outline-secondary"
+          [ngbPopover]="previewContent" [popoverTitle]="document.title | documentTitle"
+          autoClose="true" popoverClass="shadow" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()" #popover="ngbPopover">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16">
               <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
               <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
             </svg>
           </a>
+          <ng-template #previewContent>
+            <object [data]="previewUrl | safe" class="preview" width="100%"></object>
+          </ng-template>
           <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" (click)="$event.stopPropagation()" i18n-title>
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
@@ -50,9 +86,7 @@
             </svg>
           </a>
         </div>
-        <small class="text-muted pl-1">{{document.created | customDate:'shortDate'}}</small>
       </div>
-
     </div>
   </div>
 </div>

src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss

@@ -1,9 +1,13 @@
 @import "/src/theme";
 
+.card-text {
+  font-size: 90%;
+}
+
 .doc-img {
   object-fit: cover;
   object-position: top left;
-  height: 200px;
+  height: 175px;
   mix-blend-mode: multiply;
 }
 
@@ -34,3 +38,32 @@
 .doc-img-background-selected {
   background-color: $primaryFaded;
 }
+
+.card-info {
+  line-height: 1;
+
+  button {
+    line-height: 1;
+
+    &:hover,
+    &:focus {
+      background-color: transparent !important;
+      color: $primary;
+    }
+  }
+
+  .metadata-icon {
+    width: 0.9rem;
+    height: 0.9rem;
+    padding: 0.05rem;
+  }
+}
+
+.card-footer .btn {
+  padding-top: .10rem;
+}
+
+::ng-deep .tooltip-inner {
+  text-align: left !important;
+  font-size: 90%;
+}

src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts

@@ -1,13 +1,14 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { DocumentService } from 'src/app/services/rest/document.service';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'app-document-card-small',
   templateUrl: './document-card-small.component.html',
-  styleUrls: ['./document-card-small.component.scss']
+  styleUrls: ['./document-card-small.component.scss', '../popover-preview/popover-preview.scss']
 })
 export class DocumentCardSmallComponent implements OnInit {
 
@@ -15,7 +16,7 @@ export class DocumentCardSmallComponent implements OnInit {
 
   @Input()
   selected = false
-  
+
   @Output()
   toggleSelected = new EventEmitter()
 
@@ -28,8 +29,16 @@ export class DocumentCardSmallComponent implements OnInit {
   @Output()
   clickCorrespondent = new EventEmitter<number>()
 
+  @Output()
+  clickDocumentType = new EventEmitter<number>()
+
   moreTags: number = null
 
+  @ViewChild('popover') popover: NgbPopover
+
+  mouseOnPreview = false
+  popoverHidden = true
+
   ngOnInit(): void {
   }
 
@@ -45,7 +54,7 @@ export class DocumentCardSmallComponent implements OnInit {
     return this.documentService.getDownloadUrl(this.document.id)
   }
 
-  getPreviewUrl() {
+  get previewUrl() {
     return this.documentService.getPreviewUrl(this.document.id)
   }
 
@@ -62,4 +71,28 @@ export class DocumentCardSmallComponent implements OnInit {
     )
   }
 
+  mouseEnterPreview() {
+    this.mouseOnPreview = true
+    if (!this.popover.isOpen()) {
+      // we're going to open but hide to pre-load content during hover delay
+      this.popover.open()
+      this.popoverHidden = true
+      setTimeout(() => {
+        if (this.mouseOnPreview) {
+          // show popover
+          this.popoverHidden = false
+        } else {
+          this.popover.close()
+        }
+      }, 600);
+    }
+  }
+
+  mouseLeavePreview() {
+    this.mouseOnPreview = false
+  }
+
+  mouseLeaveCard() {
+    this.popover.close()
+  }
 }

src-ui/src/app/components/document-list/document-list.component.html

@@ -76,7 +76,7 @@
 </app-page-header>
 
 <div class="w-100 mb-2 mb-sm-4">
-  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [rulesModified]="filterRulesModified" (filterRulesChange)="rulesChanged()" (reset)="resetFilters()" #filterEditor></app-filter-editor>
+  <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [unmodifiedFilterRules]="unmodifiedFilterRules" #filterEditor></app-filter-editor>
   <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
 
@@ -89,86 +89,95 @@
   [rotate]="true" aria-label="Default pagination"></ngb-pagination>
 </div>
 
-<div *ngIf="displayMode == 'largeCards'">
-  <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" [details]="d.content" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)">
-  </app-document-card-large>
-</div>
+<ng-container *ngIf="list.error ; else documentListNoError">
+  <div class="alert alert-danger" role="alert">Error while loading documents: {{list.error}}</div>
+</ng-container>
 
-<table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
-  <thead>
-    <th></th>
-    <th class="d-none d-lg-table-cell"
-      sortable="archive_serial_number"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>ASN</th>
-    <th class="d-none d-md-table-cell"
-      sortable="correspondent__name"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>Correspondent</th>
-    <th
-      sortable="title"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>Title</th>
-    <th class="d-none d-xl-table-cell"
-      sortable="document_type__name"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>Document type</th>
-    <th
-      sortable="created"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>Created</th>
-    <th class="d-none d-xl-table-cell"
-      sortable="added"
-      [currentSortField]="list.sortField"
-      [currentSortReverse]="list.sortReverse"
-      (sort)="onSort($event)"
-      i18n>Added</th>
-  </thead>
-  <tbody>
-    <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" (click)="toggleSelected(d, $event)" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
-      <td>
-        <div class="custom-control custom-checkbox">
-          <input type="checkbox" class="custom-control-input" id="docCheck{{d.id}}" [checked]="list.isSelected(d)" (click)="toggleSelected(d, $event)">
-          <label class="custom-control-label" for="docCheck{{d.id}}"></label>
-        </div>
-      </td>
-      <td class="d-none d-lg-table-cell">
-        {{d.archive_serial_number}}
-      </td>
-      <td class="d-none d-md-table-cell">
-        <ng-container *ngIf="d.correspondent">
-          <a [routerLink]="" (click)="clickCorrespondent(d.correspondent);$event.stopPropagation()" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
-        </ng-container>
-      </td>
-      <td>
-        <a routerLink="/documents/{{d.id}}" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a>
-        <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id);$event.stopPropagation()"></app-tag>
-      </td>
-      <td class="d-none d-xl-table-cell">
-        <ng-container *ngIf="d.document_type">
-          <a [routerLink]="" (click)="clickDocumentType(d.document_type);$event.stopPropagation()" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
-        </ng-container>
-      </td>
-      <td>
-        {{d.created | customDate}}
-      </td>
-      <td class="d-none d-xl-table-cell">
-        {{d.added | customDate}}
-      </td>
-    </tr>
-  </tbody>
-</table>
+<ng-template #documentListNoError>
 
-<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
-  <app-document-card-small [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)"  [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
-</div>
+  <div *ngIf="displayMode == 'largeCards'">
+    <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickMoreLike)="clickMoreLike(d.id)">
+    </app-document-card-large>
+  </div>
+  
+  <table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
+    <thead>
+      <th></th>
+      <th class="d-none d-lg-table-cell"
+        sortable="archive_serial_number"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>ASN</th>
+      <th class="d-none d-md-table-cell"
+        sortable="correspondent__name"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Correspondent</th>
+      <th
+        sortable="title"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Title</th>
+      <th class="d-none d-xl-table-cell"
+        sortable="document_type__name"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Document type</th>
+      <th
+        sortable="created"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Created</th>
+      <th class="d-none d-xl-table-cell"
+        sortable="added"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Added</th>
+    </thead>
+    <tbody>
+      <tr *ngFor="let d of list.documents; trackBy: trackByDocumentId" (click)="toggleSelected(d, $event)" [ngClass]="list.isSelected(d) ? 'table-row-selected' : ''">
+        <td>
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="docCheck{{d.id}}" [checked]="list.isSelected(d)" (click)="toggleSelected(d, $event)">
+            <label class="custom-control-label" for="docCheck{{d.id}}"></label>
+          </div>
+        </td>
+        <td class="d-none d-lg-table-cell">
+          {{d.archive_serial_number}}
+        </td>
+        <td class="d-none d-md-table-cell">
+          <ng-container *ngIf="d.correspondent">
+            <a [routerLink]="" (click)="clickCorrespondent(d.correspondent);$event.stopPropagation()" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+          </ng-container>
+        </td>
+        <td>
+          <a routerLink="/documents/{{d.id}}" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a>
+          <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id);$event.stopPropagation()"></app-tag>
+        </td>
+        <td class="d-none d-xl-table-cell">
+          <ng-container *ngIf="d.document_type">
+            <a [routerLink]="" (click)="clickDocumentType(d.document_type);$event.stopPropagation()" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+          </ng-container>
+        </td>
+        <td>
+          {{d.created | customDate}}
+        </td>
+        <td class="d-none d-xl-table-cell">
+          {{d.added | customDate}}
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  
+  <div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
+    <app-document-card-small [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small>
+  </div>
+  
+
+</ng-template>

src-ui/src/app/components/document-list/document-list.component.ts

@@ -2,6 +2,8 @@ import { Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Subscription } from 'rxjs';
+import { FilterRule } from 'src/app/data/filter-rule';
+import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type';
 import { PaperlessDocument } from 'src/app/data/paperless-document';
 import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive';
@@ -37,7 +39,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
 
   displayMode = 'smallCards' // largeCards, smallCards, details
 
-  filterRulesModified: boolean = false
+  unmodifiedFilterRules: FilterRule[] = []
 
   private consumptionFinishedSubscription: Subscription
 
@@ -81,12 +83,12 @@ export class DocumentListComponent implements OnInit, OnDestroy {
           }
           this.list.activateSavedView(view)
           this.list.reload()
-          this.rulesChanged()
+          this.unmodifiedFilterRules = view.filter_rules
         })
       } else {
         this.list.activateSavedView(null)
         this.list.reload()
-        this.rulesChanged()
+        this.unmodifiedFilterRules = []
       }
     })
   }
@@ -100,7 +102,6 @@ export class DocumentListComponent implements OnInit, OnDestroy {
   loadViewConfig(view: PaperlessSavedView) {
     this.list.loadSavedView(view)
     this.list.reload()
-    this.rulesChanged()
   }
 
   saveViewConfig() {
@@ -113,6 +114,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
       }
       this.savedViewService.patch(savedView).subscribe(result => {
         this.toastService.showInfo($localize`View "${this.list.activeSavedViewTitle}" saved successfully.`)
+        this.unmodifiedFilterRules = this.list.filterRules
       })
     }
   }
@@ -141,46 +143,6 @@ export class DocumentListComponent implements OnInit, OnDestroy {
     })
   }
 
-  resetFilters(): void {
-    this.filterRulesModified = false
-    if (this.list.activeSavedViewId) {
-      this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(viewUntouched => {
-        this.list.filterRules = viewUntouched.filter_rules
-        this.list.reload()
-      })
-    } else {
-      this.list.filterRules = []
-      this.list.reload()
-    }
-  }
-
-  rulesChanged() {
-    let modified = false
-    if (this.list.activeSavedViewId == null) {
-      modified = this.list.filterRules.length > 0 // documents list is modified if it has any filters
-    } else {
-      // compare savedView current filters vs original
-      this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(view => {
-        let filterRulesInitial = view.filter_rules
-
-        if (this.list.filterRules.length !== filterRulesInitial.length) modified = true
-        else {
-          modified = this.list.filterRules.some(rule => {
-            return (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined)
-          })
-
-          if (!modified) {
-            // only check other direction if we havent already determined is modified
-            modified = filterRulesInitial.some(rule => {
-              this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined
-            })
-          }
-        }
-      })
-    }
-    this.filterRulesModified = modified
-  }
-
   toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
     if (!event.shiftKey) this.list.toggleSelected(document)
     else this.list.selectRangeTo(document)
@@ -207,6 +169,10 @@ export class DocumentListComponent implements OnInit, OnDestroy {
     })
   }
 
+  clickMoreLike(documentID: number) {
+    this.list.quickFilter([{rule_type: FILTER_FULLTEXT_MORELIKE, value: documentID.toString()}])
+  }
+
   trackByDocumentId(index, item: PaperlessDocument) {
     return item.id
   }

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html

@@ -1,7 +1,6 @@
 <div class="row">
    <div class="col mb-2 mb-xl-0">
      <div class="form-inline d-flex align-items-center">
-         <label class="text-muted mr-2 mb-0" i18n>Filter by:</label>
          <div class="input-group input-group-sm flex-fill w-auto">
            <div class="input-group-prepend" ngbDropdown>
             <button class="btn btn-outline-primary" ngbDropdownToggle>{{textFilterTargetName}}</button>   
@@ -9,7 +8,7 @@
               <button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button>
             </div>
           </div>
-          <input class="form-control form-control-sm" type="text" [(ngModel)]="textFilter">
+          <input #textFilterInput class="form-control form-control-sm" type="text" [(ngModel)]="textFilter" [readonly]="textFilterTarget == 'fulltext-morelike'">
          </div>
      </div>
   </div>

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
+import { Component, EventEmitter, Input, Output, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
 import { PaperlessTag } from 'src/app/data/paperless-tag';
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
@@ -8,12 +8,17 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
 import { TagService } from 'src/app/services/rest/tag.service';
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
 import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
 import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { DocumentService } from 'src/app/services/rest/document.service';
+import { PaperlessDocument } from 'src/app/data/paperless-document';
 
 const TEXT_FILTER_TARGET_TITLE = "title"
 const TEXT_FILTER_TARGET_TITLE_CONTENT = "title-content"
+const TEXT_FILTER_TARGET_ASN = "asn"
+const TEXT_FILTER_TARGET_FULLTEXT_QUERY = "fulltext-query"
+const TEXT_FILTER_TARGET_FULLTEXT_MORELIKE = "fulltext-morelike"
 
 @Component({
   selector: 'app-filter-editor',
@@ -51,6 +56,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
         case FILTER_TITLE:
           return $localize`Title: ${rule.value}`
+
+        case FILTER_ASN:
+          return $localize`ASN: ${rule.value}`
       }
     }
 
@@ -60,19 +68,33 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
-    private correspondentService: CorrespondentService
+    private correspondentService: CorrespondentService,
+    private documentService: DocumentService
   ) { }
 
+  @ViewChild("textFilterInput")
+  textFilterInput: ElementRef
+
   tags: PaperlessTag[] = []
   correspondents: PaperlessCorrespondent[] = []
   documentTypes: PaperlessDocumentType[] = []
 
   _textFilter = ""
+  _moreLikeId: number
+  _moreLikeDoc: PaperlessDocument
 
-  textFilterTargets = [
-    {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
-    {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`}
-  ]
+  get textFilterTargets() {
+    let targets = [
+      {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
+      {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
+      {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`},
+      {id: TEXT_FILTER_TARGET_FULLTEXT_QUERY, name: $localize`Advanced search`}
+    ]
+    if (this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+      targets.push({id: TEXT_FILTER_TARGET_FULLTEXT_MORELIKE, name: $localize`More like`})
+    }
+    return targets
+  }
 
   textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
 
@@ -90,12 +112,28 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   dateAddedBefore: string
   dateAddedAfter: string
 
+  _unmodifiedFilterRules: FilterRule[] = []
+  _filterRules: FilterRule[] = []
+
+  @Input()
+  set unmodifiedFilterRules(value: FilterRule[]) {
+    this._unmodifiedFilterRules = value
+    this.checkIfRulesHaveChanged()
+  }
+
+  get unmodifiedFilterRules(): FilterRule[] {
+    return this._unmodifiedFilterRules
+  }
+
   @Input()
   set filterRules (value: FilterRule[]) {
+    this._filterRules = value
+
     this.documentTypeSelectionModel.clear(false)
     this.tagSelectionModel.clear(false)
     this.correspondentSelectionModel.clear(false)
     this._textFilter = null
+    this._moreLikeId = null
     this.dateAddedBefore = null
     this.dateAddedAfter = null
     this.dateCreatedBefore = null
@@ -111,6 +149,22 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
           this._textFilter = rule.value
           this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
           break
+        case FILTER_ASN:
+          this._textFilter = rule.value
+          this.textFilterTarget = TEXT_FILTER_TARGET_ASN
+          break
+        case FILTER_FULLTEXT_QUERY:
+          this._textFilter = rule.value
+          this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY
+          break
+        case FILTER_FULLTEXT_MORELIKE:
+          this._moreLikeId = +rule.value
+          this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_MORELIKE
+          this.documentService.get(this._moreLikeId).subscribe(result => {
+            this._moreLikeDoc = result
+            this._textFilter = result.title
+          })
+          break
         case FILTER_CREATED_AFTER:
           this.dateCreatedAfter = rule.value
           break
@@ -137,6 +191,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
           break
       }
     })
+    this.checkIfRulesHaveChanged()
   }
 
   get filterRules(): FilterRule[] {
@@ -147,6 +202,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._textFilter})
     }
+    if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) {
+      filterRules.push({rule_type: FILTER_ASN, value: this._textFilter})
+    }
+    if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_QUERY) {
+      filterRules.push({rule_type: FILTER_FULLTEXT_QUERY, value: this._textFilter})
+    }
+    if (this._moreLikeId && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+      filterRules.push({rule_type: FILTER_FULLTEXT_MORELIKE, value: this._moreLikeId?.toString()})
+    }
     if (this.tagSelectionModel.isNoneSelected()) {
       filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
     } else {
@@ -178,12 +242,27 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   @Output()
   filterRulesChange = new EventEmitter<FilterRule[]>()
 
-  @Output()
-  reset = new EventEmitter()
-
-  @Input()
   rulesModified: boolean = false
 
+  private checkIfRulesHaveChanged() {
+    let modified = false
+    if (this._unmodifiedFilterRules.length != this._filterRules.length) {
+      modified = true
+    } else {
+      modified = this._unmodifiedFilterRules.some(rule => {
+        return (this._filterRules.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined)
+      })
+
+      if (!modified) {
+        // only check other direction if we havent already determined is modified
+        modified = this._filterRules.some(rule => {
+          this._unmodifiedFilterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined
+        })
+      }
+    }
+    this.rulesModified = modified
+  }
+
   updateRules() {
     this.filterRulesChange.next(this.filterRules)
   }
@@ -211,8 +290,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
       distinctUntilChanged()
     ).subscribe(text => {
       this._textFilter = text
+      this.documentService.searchQuery = text
       this.updateRules()
     })
+
+    if (this._textFilter) this.documentService.searchQuery = this._textFilter
+
   }
 
   ngOnDestroy() {
@@ -220,7 +303,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   resetSelected() {
-    this.reset.next()
+    this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
+    this.filterRules = this._unmodifiedFilterRules
+    this.updateRules()
   }
 
   toggleTag(tagId: number) {
@@ -248,7 +333,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   }
 
   changeTextFilterTarget(target) {
+    if (this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE && target != TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+      this._textFilter = ""
+    }
     this.textFilterTarget = target
+    this.textFilterInput.nativeElement.focus()
     this.updateRules()
   }
 }

src-ui/src/app/components/document-list/popover-preview/popover-preview.scss

@@ -0,0 +1,22 @@
+::ng-deep .popover {
+  max-width: 40rem;
+
+  .preview {
+    min-width: 30rem;
+    min-height: 18rem;
+    max-height: 35rem;
+    overflow-y: scroll;
+  }
+
+  .spinner-border {
+    position: absolute;
+    top: 4rem;
+    left: calc(50% - 0.5rem);
+    z-index: 0;
+  }
+}
+
+ ::ng-deep .popover-hidden .popover {
+  opacity: 0;
+  pointer-events: none;
+}

src-ui/src/app/components/manage/logs/logs.component.html

@@ -11,8 +11,8 @@
 
 <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
-<div class="bg-dark p-3 mb-3 text-light text-monospace log-container">
+<div class="bg-dark p-3 text-light text-monospace log-container" #logContainer>
   <p
     class="m-0 p-0 log-entry-{{getLogLevel(log)}}"
-    *ngFor="let log of logs" style="white-space: pre;">{{log}}</p>
+    *ngFor="let log of logs">{{log}}</p>
 </div>

src-ui/src/app/components/manage/logs/logs.component.scss

@@ -16,9 +16,11 @@
 }
 
 .log-container {
-
-  overflow: scroll;
-
-  height: calc(100vh - 190px);
+  overflow-y: scroll;
+  height: calc(100vh - 200px);
   top: 70px;
-}
+
+  p {
+    white-space: pre-wrap;
+  }
+}

src-ui/src/app/components/manage/logs/logs.component.ts

@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnInit, AfterViewChecked, ViewChild } from '@angular/core';
 import { LogService } from 'src/app/services/rest/log.service';
 
 @Component({
@@ -6,7 +6,7 @@ import { LogService } from 'src/app/services/rest/log.service';
   templateUrl: './logs.component.html',
   styleUrls: ['./logs.component.scss']
 })
-export class LogsComponent implements OnInit {
+export class LogsComponent implements OnInit, AfterViewChecked {
 
   constructor(private logService: LogService) { }
 
@@ -16,6 +16,8 @@ export class LogsComponent implements OnInit {
 
   activeLog: string
 
+  @ViewChild('logContainer') logContainer: ElementRef
+
   ngOnInit(): void {
     this.logService.list().subscribe(result => {
       this.logFiles = result
@@ -26,6 +28,10 @@ export class LogsComponent implements OnInit {
     })
   }
 
+  ngAfterViewChecked() {
+    this.scrollToBottom();
+  }
+
   reloadLogs() {
     this.logService.get(this.activeLog).subscribe(result => {
       this.logs = result
@@ -48,4 +54,12 @@ export class LogsComponent implements OnInit {
     }
   }
 
+  scrollToBottom(): void {
+    this.logContainer?.nativeElement.scroll({
+      top: this.logContainer.nativeElement.scrollHeight,
+      left: 0,
+      behavior: 'auto'
+    });
+  }
+
 }

src-ui/src/app/components/manage/settings/settings.component.html

@@ -111,11 +111,11 @@
 
       </ng-template>
     </li>
-    
+
     <li [ngbNavItem]="2">
       <a ngbNavLink i18n>Notifications</a>
       <ng-template ngbNavContent>
-        
+
         <h4 i18n>Document processing</h4>
 
         <div class="form-row form-group">

src-ui/src/app/components/search/result-highlight/result-highlight.component.html

@@ -1,3 +0,0 @@
-... <span *ngFor="let fragment of highlights">
-    <span *ngFor="let token of fragment" [class.match]="token.highlight">{{token.text}}</span> ... 
-</span>

src-ui/src/app/components/search/result-highlight/result-highlight.component.scss

@@ -1,4 +0,0 @@
-.match {
-    color: black;
-    background-color: rgb(255, 211, 66);
-}

src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResultHighlightComponent } from './result-highlight.component';
-
-describe('ResultHighlightComponent', () => {
-  let component: ResultHighlightComponent;
-  let fixture: ComponentFixture<ResultHighlightComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ResultHighlightComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ResultHighlightComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src-ui/src/app/components/search/result-highlight/result-highlight.component.ts

@@ -1,19 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { SearchHitHighlight } from 'src/app/data/search-result';
-
-@Component({
-  selector: 'app-result-highlight',
-  templateUrl: './result-highlight.component.html',
-  styleUrls: ['./result-highlight.component.scss']
-})
-export class ResultHighlightComponent implements OnInit {
-
-  constructor() { }
-
-  @Input()
-  highlights: SearchHitHighlight[][]
-
-  ngOnInit(): void {
-  }
-
-}

src-ui/src/app/components/search/search.component.html

@@ -1,28 +0,0 @@
-<app-page-header i18n-title title="Search results">
-</app-page-header>
-
-<div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
-
-<p *ngIf="more_like" i18n>
-    Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
-</p>
-
-<p *ngIf="query">
-    <ng-container i18n>Search query: <i>{{query}}</i></ng-container>
-    <ng-container *ngIf="correctedQuery">
-        - <ng-container i18n>Did you mean "<a [routerLink]="" (click)="searchCorrectedQuery()">{{correctedQuery}}</a>"?</ng-container>
-    </ng-container>
-</p>
-
-<div *ngIf="!errorMessage" [class.result-content-searching]="searching" infiniteScroll (scrolled)="onScroll()">
-    <p i18n>{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}</p>
-    <ng-container *ngFor="let result of results">
-        <app-document-card-large *ngIf="result.document"
-            [document]="result.document"
-            [details]="result.highlights"
-            [searchScore]="result.score / maxScore"
-            [moreLikeThis]="true">
-        </app-document-card-large>
-    </ng-container>
-
-</div>

src-ui/src/app/components/search/search.component.scss

@@ -1,15 +0,0 @@
-.result-content {
-    color: darkgray;
-}
-
-.doc-img {
-    object-fit: cover;
-    object-position: top;
-    height: 100%;
-    position: absolute;
-
-}
-
-.result-content-searching {
-    opacity: 0.3;
-}

src-ui/src/app/components/search/search.component.ts

@@ -1,95 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { PaperlessDocument } from 'src/app/data/paperless-document';
-import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
-import { SearchHit } from 'src/app/data/search-result';
-import { DocumentService } from 'src/app/services/rest/document.service';
-import { SearchService } from 'src/app/services/rest/search.service';
-
-@Component({
-  selector: 'app-search',
-  templateUrl: './search.component.html',
-  styleUrls: ['./search.component.scss']
-})
-export class SearchComponent implements OnInit {
-
-  results: SearchHit[] = []
-
-  query: string = ""
-
-  more_like: number
-
-  more_like_doc: PaperlessDocument
-
-  searching = false
-
-  currentPage = 1
-
-  pageCount = 1
-
-  resultCount
-
-  correctedQuery: string = null
-
-  errorMessage: string
-
-  get maxScore() {
-    return this.results?.length > 0 ? this.results[0].score : 100
-  }
-
-  constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router, private documentService: DocumentService) { }
-
-  ngOnInit(): void {
-    this.route.queryParamMap.subscribe(paramMap => {
-      window.scrollTo(0, 0)
-      this.query = paramMap.get('query')
-      this.more_like = paramMap.has('more_like') ? +paramMap.get('more_like') : null
-      if (this.more_like) {
-        this.documentService.get(this.more_like).subscribe(r => {
-          this.more_like_doc = r
-        })
-      } else {
-        this.more_like_doc = null
-      }
-      this.searching = true
-      this.currentPage = 1
-      this.loadPage()
-    })
-
-  }
-
-  searchCorrectedQuery() {
-    this.router.navigate(["search"], {queryParams: {query: this.correctedQuery, more_like: this.more_like}})
-  }
-
-  loadPage(append: boolean = false) {
-    this.errorMessage = null
-    this.correctedQuery = null
-
-    this.searchService.search(this.query, this.currentPage, this.more_like).subscribe(result => {
-      if (append) {
-        this.results.push(...result.results)
-      } else {
-        this.results = result.results
-      }
-      this.pageCount = result.page_count
-      this.searching = false
-      this.resultCount = result.count
-      this.correctedQuery = result.corrected_query
-    }, error => {
-      this.searching = false
-      this.resultCount = 1
-      this.pageCount = 1
-      this.results = []
-      this.errorMessage = error.error
-    })
-  }
-
-  onScroll() {
-    if (this.currentPage < this.pageCount) {
-      this.currentPage += 1
-      this.loadPage(true)
-    }
-  }
-
-}

src-ui/src/app/data/filter-rule-type.ts

@@ -22,6 +22,9 @@ export const FILTER_ASN_ISNULL = 18
 
 export const FILTER_TITLE_CONTENT = 19
 
+export const FILTER_FULLTEXT_QUERY = 20
+export const FILTER_FULLTEXT_MORELIKE = 21
+
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_TITLE, filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
@@ -51,7 +54,11 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
   {id: FILTER_MODIFIED_AFTER, filtervar: "modified__date__gt", datatype: "date", multi: false},
   {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false},
 
-  {id: FILTER_TITLE_CONTENT, filtervar: "title_content", datatype: "string", multi: false}
+  {id: FILTER_TITLE_CONTENT, filtervar: "title_content", datatype: "string", multi: false},
+
+  {id: FILTER_FULLTEXT_QUERY, filtervar: "query", datatype: "string", multi: false},
+
+  {id: FILTER_FULLTEXT_MORELIKE, filtervar: "more_like_id", datatype: "number", multi: false},
 ]
 
 export interface FilterRuleType {

src-ui/src/app/data/paperless-document.ts

@@ -4,6 +4,15 @@ import { PaperlessTag } from './paperless-tag'
 import { PaperlessDocumentType } from './paperless-document-type'
 import { Observable } from 'rxjs'
 
+export interface SearchHit {
+
+  score?: number
+  rank?: number
+
+  highlights?: string
+
+}
+
 export interface PaperlessDocument extends ObjectWithId {
 
     correspondent$?: Observable<PaperlessCorrespondent>
@@ -40,4 +49,6 @@ export interface PaperlessDocument extends ObjectWithId {
 
     archive_serial_number?: number
 
+    __search_hit__?: SearchHit
+
 }

src-ui/src/app/data/search-result.ts

@@ -1,29 +0,0 @@
-import { PaperlessDocument } from './paperless-document'
-
-export class SearchHitHighlight {
-  text?: string
-  term?: number
-}
-
-export interface SearchHit {
-  id?: number
-  title?: string
-  score?: number
-  rank?: number
-
-  highlights?: SearchHitHighlight[][]
-  document?: PaperlessDocument
-}
-
-export interface SearchResult {
-
-  count?: number
-  page?: number
-  page_count?: number
-
-  corrected_query?: string
-
-  results?: SearchHit[]
-
-
-}

src-ui/src/app/pipes/custom-date.pipe.ts

@@ -4,8 +4,8 @@ import { SettingsService, SETTINGS_KEYS } from '../services/settings.service';
 
 const FORMAT_TO_ISO_FORMAT = {
   "longDate": "y-MM-dd",
-  "mediumDate": "yy-MM-dd",
-  "shortDate": "yy-MM-dd"
+  "mediumDate": "y-MM-dd",
+  "shortDate": "y-MM-dd"
 }
 
 @Pipe({

src-ui/src/app/services/document-list-view.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { cloneFilterRules, FilterRule } from '../data/filter-rule';
+import { FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY } from '../data/filter-rule-type';
 import { PaperlessDocument } from '../data/paperless-document';
 import { PaperlessSavedView } from '../data/paperless-saved-view';
 import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys';
@@ -38,6 +39,7 @@ interface ListViewState {
 export class DocumentListViewService {
 
   isReloading: boolean = false
+  error: string = null
 
   rangeSelectionAnchorIndex: number
   lastRangeSelectionToIndex: number
@@ -101,6 +103,7 @@ export class DocumentListViewService {
 
   reload(onFinish?) {
     this.isReloading = true
+    this.error = null
     let activeListViewState = this.activeListViewState
 
     this.documentService.listFiltered(
@@ -124,12 +127,17 @@ export class DocumentListViewService {
             // this happens when applying a filter: the current page might not be available anymore due to the reduced result set.
             activeListViewState.currentPage = 1
             this.reload()
+          } else {
+            this.error = error.error
           }
         })
   }
 
   set filterRules(filterRules: FilterRule[]) {
     this.activeListViewState.filterRules = filterRules
+    if (filterRules.find(r => (r.rule_type == FILTER_FULLTEXT_QUERY || r.rule_type == FILTER_FULLTEXT_MORELIKE))) {
+      this.activeListViewState.currentPage = 1
+    }
     this.reload()
     this.reduceSelectionToFilter()
     this.saveDocumentListView()
@@ -197,7 +205,7 @@ export class DocumentListViewService {
         sortField: this.activeListViewState.sortField,
         sortReverse: this.activeListViewState.sortReverse
       }
-      sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(savedState))
+      localStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(savedState))
     }
   }
 
@@ -207,7 +215,11 @@ export class DocumentListViewService {
     this.activeListViewState.currentPage = 1
     this.reduceSelectionToFilter()
     this.saveDocumentListView()
-    this.router.navigate(["documents"])
+    if (this.router.url == "/documents") {
+      this.reload()
+    } else {
+      this.router.navigate(["documents"])
+    }
   }
 
   getLastPage(): number {
@@ -317,8 +329,8 @@ export class DocumentListViewService {
     return this.documents.map(d => d.id).indexOf(documentID)
   }
 
-  constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) {
-     let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
+  constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router, private route: ActivatedRoute) {
+     let documentListViewConfigJson = localStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
     if (documentListViewConfigJson) {
       try {
         let savedState: ListViewState = JSON.parse(documentListViewConfigJson)
@@ -332,7 +344,7 @@ export class DocumentListViewService {
         let newState = Object.assign(this.defaultListViewState(), savedState)
         this.listViewStates.set(null, newState)
       } catch (e) {
-        sessionStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
+        localStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
       }
     }
   }

src-ui/src/app/services/rest/document.service.ts

@@ -39,6 +39,8 @@ export interface SelectionData {
 })
 export class DocumentService extends AbstractPaperlessService<PaperlessDocument> {
 
+  private _searchQuery: string
+
   constructor(http: HttpClient, private correspondentService: CorrespondentService, private documentTypeService: DocumentTypeService, private tagService: TagService) {
     super(http, 'documents')
   }
@@ -92,6 +94,7 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
 
   getPreviewUrl(id: number, original: boolean = false): string {
     let url = this.getResourceUrl(id, 'preview')
+    if (this._searchQuery) url += `#search="${this._searchQuery}"`
     if (original) {
       url += "?original=true"
     }
@@ -138,4 +141,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     return this.http.post(this.getResourceUrl(null, 'bulk_download'), {"documents": ids, "content": content}, { responseType: 'blob' })
   }
 
+  public set searchQuery(query: string) {
+    this._searchQuery = query
+  }
+
 }

src-ui/src/app/services/rest/search.service.ts

@@ -2,8 +2,6 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { PaperlessDocument } from 'src/app/data/paperless-document';
-import { SearchResult } from 'src/app/data/search-result';
 import { environment } from 'src/environments/environment';
 import { DocumentService } from './document.service';
 
@@ -13,30 +11,7 @@ import { DocumentService } from './document.service';
 })
 export class SearchService {
   
-  constructor(private http: HttpClient, private documentService: DocumentService) { }
-
-  search(query: string, page?: number, more_like?: number): Observable<SearchResult> {
-    let httpParams = new HttpParams()
-    if (query) {
-      httpParams = httpParams.set('query', query)
-    }
-    if (page) {
-      httpParams = httpParams.set('page', page.toString())
-    }
-    if (more_like) {
-      httpParams = httpParams.set('more_like', more_like.toString())
-    }
-    return this.http.get<SearchResult>(`${environment.apiBaseUrl}search/`, {params: httpParams}).pipe(
-      map(result => {
-        result.results.forEach(hit => {
-          if (hit.document) {
-            this.documentService.addObservablesToDocument(hit.document)
-          }
-        })
-        return result
-      })
-    )
-  }
+  constructor(private http: HttpClient) { }
 
   autocomplete(term: string): Observable<string[]> {
     return this.http.get<string[]>(`${environment.apiBaseUrl}search/autocomplete/`, {params: new HttpParams().set('term', term)})

src-ui/src/app/services/settings.service.ts

@@ -89,12 +89,16 @@ export class SettingsService {
     return [
       {code: "en-us", name: $localize`English (US)`, englishName: "English (US)", dateInputFormat: "mm/dd/yyyy"},
       {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)", dateInputFormat: "dd/mm/yyyy"},
-      {code: "de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
-      {code: "nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
-      {code: "fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
+      {code: "de-de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
+      {code: "nl-nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
+      {code: "fr-fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
+      {code: "pt-pt", name: $localize`Portuguese`, englishName: "Portuguese", dateInputFormat: "dd/mm/yyyy"},
       {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"},
-      {code: "it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"},
-      {code: "ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"}
+      {code: "it-it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"},
+      {code: "ro-ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"},
+      {code: "ru-ru", name: $localize`Russian`, englishName: "Russian", dateInputFormat: "dd.mm.yyyy"},
+      {code: "es-es", name: $localize`Spanish`, englishName: "Spanish", dateInputFormat: "dd/mm/yyyy"},
+      
     ]
   }
 

src-ui/src/environments/environment.prod.ts

@@ -3,7 +3,7 @@ export const environment = {
   apiBaseUrl: "/api/",
   apiVersion: "2",
   appTitle: "Paperless-ng",
-  version: "1.3.0",
+  version: "1.4.0",
   webSocketHost: window.location.host,
   webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
 };

src-ui/src/theme_dark.scss

@@ -76,6 +76,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .page-item.active .page-link {
+    background-color: darken($primary-dark-mode, 10%);
+  }
+
   .nav-tabs {
     border-color: $border-color-dark-mode;
 
@@ -226,7 +230,7 @@ $border-color-dark-mode: #47494f;
   }
 
   .btn-outline-secondary {
-    border-color: $text-color-dark-mode;
+    border-color: darken($text-color-dark-mode, 30%);
     color: $text-color-dark-mode;
 
     &:not(:disabled):not(.disabled):hover {
@@ -279,6 +283,10 @@ $border-color-dark-mode: #47494f;
     background-color: $bg-dark-mode !important;
   }
 
+  .card-footer button:hover {
+    color: $primary-dark-mode !important;
+  }
+
   .form-control:not(.is-invalid):not(.btn),
   input:not(.is-invalid),
   textarea:not(.is-invalid) {
@@ -392,7 +400,7 @@ $border-color-dark-mode: #47494f;
       border-color: $border-color-dark-mode;
     }
   }
-  
+
   $placements: 'top', 'right', 'bottom', 'left';
 
   @each $placement in $placements {

src/documents/consumer.py

@@ -64,9 +64,9 @@ class Consumer(LoggingMixin):
                                                      {'type': 'status_update',
                                                       'data': payload})
 
-    def _fail(self, message, log_message=None):
+    def _fail(self, message, log_message=None, exc_info=None):
         self._send_progress(100, 100, 'FAILED', message)
-        self.log("error", log_message or message)
+        self.log("error", log_message or message, exc_info=exc_info)
         raise ConsumerError(f"{self.filename}: {log_message or message}")
 
     def __init__(self):
@@ -115,12 +115,16 @@ class Consumer(LoggingMixin):
                 f"Configured pre-consume script "
                 f"{settings.PRE_CONSUME_SCRIPT} does not exist.")
 
+        self.log("info",
+                 f"Executing pre-consume script {settings.PRE_CONSUME_SCRIPT}")
+
         try:
             Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait()
         except Exception as e:
             self._fail(
                 MESSAGE_PRE_CONSUME_SCRIPT_ERROR,
-                f"Error while executing pre-consume script: {e}"
+                f"Error while executing pre-consume script: {e}",
+                exc_info=True
             )
 
     def run_post_consume_script(self, document):
@@ -134,6 +138,11 @@ class Consumer(LoggingMixin):
                 f"{settings.POST_CONSUME_SCRIPT} does not exist."
             )
 
+        self.log(
+            "info",
+            f"Executing post-consume script {settings.POST_CONSUME_SCRIPT}"
+        )
+
         try:
             Popen((
                 settings.POST_CONSUME_SCRIPT,
@@ -150,7 +159,8 @@ class Consumer(LoggingMixin):
         except Exception as e:
             self._fail(
                 MESSAGE_POST_CONSUME_SCRIPT_ERROR,
-                f"Error while executing post-consume script: {e}"
+                f"Error while executing post-consume script: {e}",
+                exc_info=True
             )
 
     def try_consume_file(self,
@@ -255,7 +265,8 @@ class Consumer(LoggingMixin):
             document_parser.cleanup()
             self._fail(
                 str(e),
-                f"Error while consuming document {self.filename}: {e}"
+                f"Error while consuming document {self.filename}: {e}",
+                exc_info=True
             )
 
         # Prepare the document classifier.
@@ -326,7 +337,8 @@ class Consumer(LoggingMixin):
             self._fail(
                 str(e),
                 f"The following error occured while consuming "
-                f"{self.filename}: {e}"
+                f"{self.filename}: {e}",
+                exc_info=True
             )
         finally:
             document_parser.cleanup()

src/documents/index.py

@@ -2,75 +2,70 @@ import logging
 import os
 from contextlib import contextmanager
 
+import math
+from dateutil.parser import isoparse
 from django.conf import settings
 from whoosh import highlight, classify, query
-from whoosh.fields import Schema, TEXT, NUMERIC, KEYWORD, DATETIME
-from whoosh.highlight import Formatter, get_text
+from whoosh.fields import Schema, TEXT, NUMERIC, KEYWORD, DATETIME, BOOLEAN
+from whoosh.highlight import Formatter, get_text, HtmlFormatter
 from whoosh.index import create_in, exists_in, open_dir
 from whoosh.qparser import MultifieldParser
 from whoosh.qparser.dateparse import DateParserPlugin
+from whoosh.searching import ResultsPage, Searcher
 from whoosh.writing import AsyncWriter
 
+from documents.models import Document
 
 logger = logging.getLogger("paperless.index")
 
 
-class JsonFormatter(Formatter):
-    def __init__(self):
-        self.seen = {}
-
-    def format_token(self, text, token, replace=False):
-        ttext = self._text(get_text(text, token, replace))
-        return {'text': ttext, 'highlight': 'true'}
-
-    def format_fragment(self, fragment, replace=False):
-        output = []
-        index = fragment.startchar
-        text = fragment.text
-        amend_token = None
-        for t in fragment.matches:
-            if t.startchar is None:
-                continue
-            if t.startchar < index:
-                continue
-            if t.startchar > index:
-                text_inbetween = text[index:t.startchar]
-                if amend_token and t.startchar - index < 10:
-                    amend_token['text'] += text_inbetween
-                else:
-                    output.append({'text': text_inbetween,
-                                   'highlight': False})
-                    amend_token = None
-            token = self.format_token(text, t, replace)
-            if amend_token:
-                amend_token['text'] += token['text']
-            else:
-                output.append(token)
-                amend_token = token
-            index = t.endchar
-        if index < fragment.endchar:
-            output.append({'text': text[index:fragment.endchar],
-                           'highlight': False})
-        return output
-
-    def format(self, fragments, replace=False):
-        output = []
-        for fragment in fragments:
-            output.append(self.format_fragment(fragment, replace=replace))
-        return output
-
-
 def get_schema():
     return Schema(
-        id=NUMERIC(stored=True, unique=True, numtype=int),
-        title=TEXT(stored=True),
+        id=NUMERIC(
+            stored=True,
+            unique=True
+        ),
+        title=TEXT(
+            sortable=True
+        ),
         content=TEXT(),
-        correspondent=TEXT(stored=True),
-        tag=KEYWORD(stored=True, commas=True, scorable=True, lowercase=True),
-        type=TEXT(stored=True),
-        created=DATETIME(stored=True, sortable=True),
-        modified=DATETIME(stored=True, sortable=True),
-        added=DATETIME(stored=True, sortable=True),
+        asn=NUMERIC(
+            sortable=True
+        ),
+
+        correspondent=TEXT(
+            sortable=True
+        ),
+        correspondent_id=NUMERIC(),
+        has_correspondent=BOOLEAN(),
+
+        tag=KEYWORD(
+            commas=True,
+            scorable=True,
+            lowercase=True
+        ),
+        tag_id=KEYWORD(
+            commas=True,
+            scorable=True
+        ),
+        has_tag=BOOLEAN(),
+
+        type=TEXT(
+            sortable=True
+        ),
+        type_id=NUMERIC(),
+        has_type=BOOLEAN(),
+
+        created=DATETIME(
+            sortable=True
+        ),
+        modified=DATETIME(
+            sortable=True
+        ),
+        added=DATETIME(
+            sortable=True
+        ),
+
     )
 
 
@@ -87,11 +82,8 @@ def open_index(recreate=False):
 
 
 @contextmanager
-def open_index_writer(ix=None, optimize=False):
-    if ix:
-        writer = AsyncWriter(ix)
-    else:
-        writer = AsyncWriter(open_index())
+def open_index_writer(optimize=False):
+    writer = AsyncWriter(open_index())
 
     try:
         yield writer
@@ -102,17 +94,35 @@ def open_index_writer(ix=None, optimize=False):
         writer.commit(optimize=optimize)
 
 
+@contextmanager
+def open_index_searcher():
+    searcher = open_index().searcher()
+
+    try:
+        yield searcher
+    finally:
+        searcher.close()
+
+
 def update_document(writer, doc):
     tags = ",".join([t.name for t in doc.tags.all()])
+    tags_ids = ",".join([str(t.id) for t in doc.tags.all()])
     writer.update_document(
         id=doc.pk,
         title=doc.title,
         content=doc.content,
         correspondent=doc.correspondent.name if doc.correspondent else None,
+        correspondent_id=doc.correspondent.id if doc.correspondent else None,
+        has_correspondent=doc.correspondent is not None,
         tag=tags if tags else None,
+        tag_id=tags_ids if tags_ids else None,
+        has_tag=len(tags) > 0,
         type=doc.document_type.name if doc.document_type else None,
+        type_id=doc.document_type.id if doc.document_type else None,
+        has_type=doc.document_type is not None,
         created=doc.created,
         added=doc.added,
+        asn=doc.archive_serial_number,
         modified=doc.modified,
     )
 
@@ -135,50 +145,137 @@ def remove_document_from_index(document):
         remove_document(writer, document)
 
 
-@contextmanager
-def query_page(ix, page, querystring, more_like_doc_id, more_like_doc_content):
-    searcher = ix.searcher()
-    try:
-        if querystring:
-            qp = MultifieldParser(
-                ["content", "title", "correspondent", "tag", "type"],
-                ix.schema)
-            qp.add_plugin(DateParserPlugin())
-            str_q = qp.parse(querystring)
-            corrected = searcher.correct_query(str_q, querystring)
-        else:
-            str_q = None
-            corrected = None
+class DelayedQuery:
 
-        if more_like_doc_id:
-            docnum = searcher.document_number(id=more_like_doc_id)
-            kts = searcher.key_terms_from_text(
-                'content', more_like_doc_content, numterms=20,
-                model=classify.Bo1Model, normalize=False)
-            more_like_q = query.Or(
-                [query.Term('content', word, boost=weight)
-                 for word, weight in kts])
-            result_page = searcher.search_page(
-                more_like_q, page, filter=str_q, mask={docnum})
-        elif str_q:
-            result_page = searcher.search_page(str_q, page)
-        else:
-            raise ValueError(
-                "Either querystring or more_like_doc_id is required."
-            )
+    @property
+    def _query(self):
+        raise NotImplementedError()
 
-        result_page.results.fragmenter = highlight.ContextFragmenter(
+    @property
+    def _query_filter(self):
+        criterias = []
+        for k, v in self.query_params.items():
+            if k == 'correspondent__id':
+                criterias.append(query.Term('correspondent_id', v))
+            elif k == 'tags__id__all':
+                for tag_id in v.split(","):
+                    criterias.append(query.Term('tag_id', tag_id))
+            elif k == 'document_type__id':
+                criterias.append(query.Term('type_id', v))
+            elif k == 'correspondent__isnull':
+                criterias.append(query.Term("has_correspondent", v == "false"))
+            elif k == 'is_tagged':
+                criterias.append(query.Term("has_tag", v == "true"))
+            elif k == 'document_type__isnull':
+                criterias.append(query.Term("has_type", v == "false"))
+            elif k == 'created__date__lt':
+                criterias.append(
+                    query.DateRange("created", start=None, end=isoparse(v)))
+            elif k == 'created__date__gt':
+                criterias.append(
+                    query.DateRange("created", start=isoparse(v), end=None))
+            elif k == 'added__date__gt':
+                criterias.append(
+                    query.DateRange("added", start=isoparse(v), end=None))
+            elif k == 'added__date__lt':
+                criterias.append(
+                    query.DateRange("added", start=None, end=isoparse(v)))
+        if len(criterias) > 0:
+            return query.And(criterias)
+        else:
+            return None
+
+    @property
+    def _query_sortedby(self):
+        # if not 'ordering' in self.query_params:
+        return None, False
+
+        # o: str = self.query_params['ordering']
+        # if o.startswith('-'):
+        #     return o[1:], True
+        # else:
+        #     return o, False
+
+    def __init__(self, searcher: Searcher, query_params, page_size):
+        self.searcher = searcher
+        self.query_params = query_params
+        self.page_size = page_size
+        self.saved_results = dict()
+        self.first_score = None
+
+    def __len__(self):
+        page = self[0:1]
+        return len(page)
+
+    def __getitem__(self, item):
+        if item.start in self.saved_results:
+            return self.saved_results[item.start]
+
+        q, mask = self._query
+        sortedby, reverse = self._query_sortedby
+
+        page: ResultsPage = self.searcher.search_page(
+            q,
+            mask=mask,
+            filter=self._query_filter,
+            pagenum=math.floor(item.start / self.page_size) + 1,
+            pagelen=self.page_size,
+            sortedby=sortedby,
+            reverse=reverse
+        )
+        page.results.fragmenter = highlight.ContextFragmenter(
             surround=50)
-        result_page.results.formatter = JsonFormatter()
+        page.results.formatter = HtmlFormatter(tagname="span", between=" ... ")
 
-        if corrected and corrected.query != str_q:
+        if not self.first_score and len(page.results) > 0:
+            self.first_score = page.results[0].score
+
+        if self.first_score:
+            page.results.top_n = list(map(
+                lambda hit: (hit[0] / self.first_score, hit[1]),
+                page.results.top_n
+            ))
+
+        self.saved_results[item.start] = page
+
+        return page
+
+
+class DelayedFullTextQuery(DelayedQuery):
+
+    @property
+    def _query(self):
+        q_str = self.query_params['query']
+        qp = MultifieldParser(
+            ["content", "title", "correspondent", "tag", "type"],
+            self.searcher.ixreader.schema)
+        qp.add_plugin(DateParserPlugin())
+        q = qp.parse(q_str)
+
+        corrected = self.searcher.correct_query(q, q_str)
+        if corrected.query != q:
             corrected_query = corrected.string
-        else:
-            corrected_query = None
 
-        yield result_page, corrected_query
-    finally:
-        searcher.close()
+        return q, None
+
+
+class DelayedMoreLikeThisQuery(DelayedQuery):
+
+    @property
+    def _query(self):
+        more_like_doc_id = int(self.query_params['more_like_id'])
+        content = Document.objects.get(id=more_like_doc_id).content
+
+        docnum = self.searcher.document_number(id=more_like_doc_id)
+        kts = self.searcher.key_terms_from_text(
+            'content', content, numterms=20,
+            model=classify.Bo1Model, normalize=False)
+        q = query.Or(
+            [query.Term('content', word, boost=weight)
+             for word, weight in kts])
+        mask = {docnum}
+
+        return q, mask
 
 
 def autocomplete(ix, term, limit=10):

src/documents/management/commands/document_exporter.py

@@ -6,15 +6,18 @@ import time
 
 import tqdm
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.core import serializers
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
 from filelock import FileLock
 
-from documents.models import Document, Correspondent, Tag, DocumentType
+from documents.models import Document, Correspondent, Tag, DocumentType, \
+    SavedView, SavedViewFilterRule
 from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \
     EXPORTER_ARCHIVE_NAME
 from paperless.db import GnuPG
+from paperless_mail.models import MailAccount, MailRule
 from ...file_handling import generate_filename, delete_empty_directories
 
 
@@ -105,6 +108,21 @@ class Command(BaseCommand):
                 serializers.serialize("json", documents))
             manifest += document_manifest
 
+            manifest += json.loads(serializers.serialize(
+                "json", MailAccount.objects.all()))
+
+            manifest += json.loads(serializers.serialize(
+                "json", MailRule.objects.all()))
+
+            manifest += json.loads(serializers.serialize(
+                "json", SavedView.objects.all()))
+
+            manifest += json.loads(serializers.serialize(
+                "json", SavedViewFilterRule.objects.all()))
+
+            manifest += json.loads(serializers.serialize(
+                "json", User.objects.all()))
+
         # 3. Export files from each document
         for index, document_dict in tqdm.tqdm(enumerate(document_manifest),
                                               total=len(document_manifest)):

src/documents/matching.py

@@ -90,7 +90,7 @@ def matches(matching_model, document):
 
     elif matching_model.matching_algorithm == MatchingModel.MATCH_LITERAL:
         result = bool(re.search(
-            rf"\b{matching_model.match}\b",
+            rf"\b{re.escape(matching_model.match)}\b",
             document_content,
             **search_kwargs
         ))
@@ -161,6 +161,9 @@ def _split_match(matching_model):
     findterms = re.compile(r'"([^"]+)"|(\S+)').findall
     normspace = re.compile(r"\s+").sub
     return [
-        normspace(" ", (t[0] or t[1]).strip()).replace(" ", r"\s+")
+        # normspace(" ", (t[0] or t[1]).strip()).replace(" ", r"\s+")
+        re.escape(
+            normspace(" ", (t[0] or t[1]).strip())
+        ).replace(r"\ ", r"\s+")
         for t in findterms(matching_model.match)
     ]

src/documents/migrations/1015_remove_null_characters.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.7 on 2021-04-04 18:28
+import logging
+
+from django.db import migrations
+
+
+logger = logging.getLogger("paperless.migrations")
+
+
+def remove_null_characters(apps, schema_editor):
+    Document = apps.get_model('documents', 'Document')
+
+    for doc in Document.objects.all():
+        content: str = doc.content
+        if '\0' in content:
+            logger.info(f"Removing null characters from document {doc}...")
+            doc.content = content.replace('\0', ' ')
+            doc.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1014_auto_20210228_1614'),
+    ]
+
+    operations = [
+        migrations.RunPython(remove_null_characters, migrations.RunPython.noop)
+    ]

src/documents/migrations/1016_auto_20210317_1351.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.7 on 2021-03-17 12:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '1015_remove_null_characters'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='savedview',
+            name='sort_field',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='sort field'),
+        ),
+        migrations.AlterField(
+            model_name='savedviewfilterrule',
+            name='rule_type',
+            field=models.PositiveIntegerField(choices=[(0, 'title contains'), (1, 'content contains'), (2, 'ASN is'), (3, 'correspondent is'), (4, 'document type is'), (5, 'is in inbox'), (6, 'has tag'), (7, 'has any tag'), (8, 'created before'), (9, 'created after'), (10, 'created year is'), (11, 'created month is'), (12, 'created day is'), (13, 'added before'), (14, 'added after'), (15, 'modified before'), (16, 'modified after'), (17, 'does not have tag'), (18, 'does not have ASN'), (19, 'title or content contains'), (20, 'fulltext query'), (21, 'more like this')], verbose_name='rule type'),
+        ),
+    ]

src/documents/models.py

@@ -359,7 +359,10 @@ class SavedView(models.Model):
 
     sort_field = models.CharField(
         _("sort field"),
-        max_length=128)
+        max_length=128,
+        null=True,
+        blank=True
+    )
     sort_reverse = models.BooleanField(
         _("sort reverse"),
         default=False)
@@ -387,6 +390,8 @@ class SavedViewFilterRule(models.Model):
         (17, _("does not have tag")),
         (18, _("does not have ASN")),
         (19, _("title or content contains")),
+        (20, _("fulltext query")),
+        (21, _("more like this"))
     ]
 
     saved_view = models.ForeignKey(

src/documents/parsers.py

@@ -143,6 +143,46 @@ def run_convert(input_file,
         raise ParseError("Convert failed at {}".format(args))
 
 
+def get_default_thumbnail():
+    return os.path.join(os.path.dirname(__file__), "resources", "document.png")
+
+
+def make_thumbnail_from_pdf_gs_fallback(in_path, temp_dir, logging_group=None):
+    out_path = os.path.join(temp_dir, "convert_gs.png")
+
+    # if convert fails, fall back to extracting
+    # the first PDF page as a PNG using Ghostscript
+    logger.warning(
+        "Thumbnail generation with ImageMagick failed, falling back "
+        "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
+        extra={'group': logging_group}
+    )
+    gs_out_path = os.path.join(temp_dir, "gs_out.png")
+    cmd = [settings.GS_BINARY,
+           "-q",
+           "-sDEVICE=pngalpha",
+           "-o", gs_out_path,
+           in_path]
+    try:
+        if not subprocess.Popen(cmd).wait() == 0:
+            raise ParseError("Thumbnail (gs) failed at {}".format(cmd))
+        # then run convert on the output from gs
+        run_convert(density=300,
+                    scale="500x5000>",
+                    alpha="remove",
+                    strip=True,
+                    trim=False,
+                    auto_orient=True,
+                    input_file=gs_out_path,
+                    output_file=out_path,
+                    logging_group=logging_group)
+
+        return out_path
+
+    except ParseError:
+        return get_default_thumbnail()
+
+
 def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None):
     """
     The thumbnail of a PDF is just a 500px wide image of the first page.
@@ -161,31 +201,8 @@ def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None):
                     output_file=out_path,
                     logging_group=logging_group)
     except ParseError:
-        # if convert fails, fall back to extracting
-        # the first PDF page as a PNG using Ghostscript
-        logger.warning(
-            "Thumbnail generation with ImageMagick failed, falling back "
-            "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
-            extra={'group': logging_group}
-        )
-        gs_out_path = os.path.join(temp_dir, "gs_out.png")
-        cmd = [settings.GS_BINARY,
-               "-q",
-               "-sDEVICE=pngalpha",
-               "-o", gs_out_path,
-               in_path]
-        if not subprocess.Popen(cmd).wait() == 0:
-            raise ParseError("Thumbnail (gs) failed at {}".format(cmd))
-        # then run convert on the output from gs
-        run_convert(density=300,
-                    scale="500x5000>",
-                    alpha="remove",
-                    strip=True,
-                    trim=False,
-                    auto_orient=True,
-                    input_file=gs_out_path,
-                    output_file=out_path,
-                    logging_group=logging_group)
+        out_path = make_thumbnail_from_pdf_gs_fallback(
+            in_path, temp_dir, logging_group)
 
     return out_path
 

src/documents/serialisers.py

@@ -50,7 +50,7 @@ class MatchingModelSerializer(serializers.ModelSerializer):
                 re.compile(match)
             except Exception as e:
                 raise serializers.ValidationError(
-                    _("Invalid regular expresssion: %(error)s") %
+                    _("Invalid regular expression: %(error)s") %
                     {'error': str(e)}
                 )
         return match

src/documents/tests/test_admin.py

@@ -27,7 +27,7 @@ class TestDocumentAdmin(DirectoriesMixin, TestCase):
         doc.title = "new title"
         self.doc_admin.save_model(None, doc, None, None)
         self.assertEqual(Document.objects.get(id=doc.id).title, "new title")
-        self.assertEqual(self.get_document_from_index(doc)['title'], "new title")
+        self.assertEqual(self.get_document_from_index(doc)['id'], doc.id)
 
     def test_delete_model(self):
         doc = Document.objects.create(title="test")

src/documents/tests/test_api.py

@@ -7,6 +7,7 @@ import tempfile
 import zipfile
 from unittest import mock
 
+import pytest
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import override_settings
@@ -294,12 +295,6 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         results = response.data['results']
         self.assertEqual(len(results), 0)
 
-    def test_search_no_query(self):
-        response = self.client.get("/api/search/")
-        results = response.data['results']
-
-        self.assertEqual(len(results), 0)
-
     def test_search(self):
         d1=Document.objects.create(title="invoice", content="the thing i bought at a shop and paid with bank account", checksum="A", pk=1)
         d2=Document.objects.create(title="bank statement 1", content="things i paid for in august", pk=2, checksum="B")
@@ -311,32 +306,24 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
             index.update_document(writer, d1)
             index.update_document(writer, d2)
             index.update_document(writer, d3)
-        response = self.client.get("/api/search/?query=bank")
+        response = self.client.get("/api/documents/?query=bank")
         results = response.data['results']
         self.assertEqual(response.data['count'], 3)
-        self.assertEqual(response.data['page'], 1)
-        self.assertEqual(response.data['page_count'], 1)
         self.assertEqual(len(results), 3)
 
-        response = self.client.get("/api/search/?query=september")
+        response = self.client.get("/api/documents/?query=september")
         results = response.data['results']
         self.assertEqual(response.data['count'], 1)
-        self.assertEqual(response.data['page'], 1)
-        self.assertEqual(response.data['page_count'], 1)
         self.assertEqual(len(results), 1)
 
-        response = self.client.get("/api/search/?query=statement")
+        response = self.client.get("/api/documents/?query=statement")
         results = response.data['results']
         self.assertEqual(response.data['count'], 2)
-        self.assertEqual(response.data['page'], 1)
-        self.assertEqual(response.data['page_count'], 1)
         self.assertEqual(len(results), 2)
 
-        response = self.client.get("/api/search/?query=sfegdfg")
+        response = self.client.get("/api/documents/?query=sfegdfg")
         results = response.data['results']
         self.assertEqual(response.data['count'], 0)
-        self.assertEqual(response.data['page'], 0)
-        self.assertEqual(response.data['page_count'], 0)
         self.assertEqual(len(results), 0)
 
     def test_search_multi_page(self):
@@ -349,53 +336,34 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         seen_ids = []
 
         for i in range(1, 6):
-            response = self.client.get(f"/api/search/?query=content&page={i}")
+            response = self.client.get(f"/api/documents/?query=content&page={i}&page_size=10")
             results = response.data['results']
             self.assertEqual(response.data['count'], 55)
-            self.assertEqual(response.data['page'], i)
-            self.assertEqual(response.data['page_count'], 6)
             self.assertEqual(len(results), 10)
 
             for result in results:
                 self.assertNotIn(result['id'], seen_ids)
                 seen_ids.append(result['id'])
 
-        response = self.client.get(f"/api/search/?query=content&page=6")
+        response = self.client.get(f"/api/documents/?query=content&page=6&page_size=10")
         results = response.data['results']
         self.assertEqual(response.data['count'], 55)
-        self.assertEqual(response.data['page'], 6)
-        self.assertEqual(response.data['page_count'], 6)
         self.assertEqual(len(results), 5)
 
         for result in results:
             self.assertNotIn(result['id'], seen_ids)
             seen_ids.append(result['id'])
 
-        response = self.client.get(f"/api/search/?query=content&page=7")
-        results = response.data['results']
-        self.assertEqual(response.data['count'], 55)
-        self.assertEqual(response.data['page'], 6)
-        self.assertEqual(response.data['page_count'], 6)
-        self.assertEqual(len(results), 5)
-
     def test_search_invalid_page(self):
         with AsyncWriter(index.open_index()) as writer:
             for i in range(15):
                 doc = Document.objects.create(checksum=str(i), pk=i+1, title=f"Document {i+1}", content="content")
                 index.update_document(writer, doc)
 
-        first_page = self.client.get(f"/api/search/?query=content&page=1").data
-        second_page = self.client.get(f"/api/search/?query=content&page=2").data
-        should_be_first_page_1 = self.client.get(f"/api/search/?query=content&page=0").data
-        should_be_first_page_2 = self.client.get(f"/api/search/?query=content&page=dgfd").data
-        should_be_first_page_3 = self.client.get(f"/api/search/?query=content&page=").data
-        should_be_first_page_4 = self.client.get(f"/api/search/?query=content&page=-7868").data
-
-        self.assertDictEqual(first_page, should_be_first_page_1)
-        self.assertDictEqual(first_page, should_be_first_page_2)
-        self.assertDictEqual(first_page, should_be_first_page_3)
-        self.assertDictEqual(first_page, should_be_first_page_4)
-        self.assertNotEqual(len(first_page['results']), len(second_page['results']))
+        response = self.client.get(f"/api/documents/?query=content&page=0&page_size=10")
+        self.assertEqual(response.status_code, 404)
+        response = self.client.get(f"/api/documents/?query=content&page=3&page_size=10")
+        self.assertEqual(response.status_code, 404)
 
     @mock.patch("documents.index.autocomplete")
     def test_search_autocomplete(self, m):
@@ -419,6 +387,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 10)
 
+    @pytest.mark.skip(reason="Not implemented yet")
     def test_search_spelling_correction(self):
         with AsyncWriter(index.open_index()) as writer:
             for i in range(55):
@@ -444,7 +413,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
             index.update_document(writer, d2)
             index.update_document(writer, d3)
 
-        response = self.client.get(f"/api/search/?more_like={d2.id}")
+        response = self.client.get(f"/api/documents/?more_like_id={d2.id}")
 
         self.assertEqual(response.status_code, 200)
 
@@ -454,6 +423,54 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(results[0]['id'], d3.id)
         self.assertEqual(results[1]['id'], d1.id)
 
+    def test_search_filtering(self):
+        t = Tag.objects.create(name="tag")
+        t2 = Tag.objects.create(name="tag2")
+        c = Correspondent.objects.create(name="correspondent")
+        dt = DocumentType.objects.create(name="type")
+
+        d1 = Document.objects.create(checksum="1", correspondent=c, content="test")
+        d2 = Document.objects.create(checksum="2", document_type=dt, content="test")
+        d3 = Document.objects.create(checksum="3", content="test")
+        d3.tags.add(t)
+        d3.tags.add(t2)
+        d4 = Document.objects.create(checksum="4", created=datetime.datetime(2020, 7, 13), content="test")
+        d4.tags.add(t2)
+        d5 = Document.objects.create(checksum="5", added=datetime.datetime(2020, 7, 13), content="test")
+        d6 = Document.objects.create(checksum="6", content="test2")
+
+        with AsyncWriter(index.open_index()) as writer:
+            for doc in Document.objects.all():
+                index.update_document(writer, doc)
+
+        def search_query(q):
+            r = self.client.get("/api/documents/?query=test" + q)
+            self.assertEqual(r.status_code, 200)
+            return [hit['id'] for hit in r.data['results']]
+
+        self.assertCountEqual(search_query(""), [d1.id, d2.id, d3.id, d4.id, d5.id])
+        self.assertCountEqual(search_query("&is_tagged=true"), [d3.id, d4.id])
+        self.assertCountEqual(search_query("&is_tagged=false"), [d1.id, d2.id, d5.id])
+        self.assertCountEqual(search_query("&correspondent__id=" + str(c.id)), [d1.id])
+        self.assertCountEqual(search_query("&document_type__id=" + str(dt.id)), [d2.id])
+        self.assertCountEqual(search_query("&correspondent__isnull"), [d2.id, d3.id, d4.id, d5.id])
+        self.assertCountEqual(search_query("&document_type__isnull"), [d1.id, d3.id, d4.id, d5.id])
+        self.assertCountEqual(search_query("&tags__id__all=" + str(t.id) + "," + str(t2.id)), [d3.id])
+        self.assertCountEqual(search_query("&tags__id__all=" + str(t.id)), [d3.id])
+        self.assertCountEqual(search_query("&tags__id__all=" + str(t2.id)), [d3.id, d4.id])
+
+        self.assertIn(d4.id, search_query("&created__date__lt=" + datetime.datetime(2020, 9, 2).strftime("%Y-%m-%d")))
+        self.assertNotIn(d4.id, search_query("&created__date__gt=" + datetime.datetime(2020, 9, 2).strftime("%Y-%m-%d")))
+
+        self.assertNotIn(d4.id, search_query("&created__date__lt=" + datetime.datetime(2020, 1, 2).strftime("%Y-%m-%d")))
+        self.assertIn(d4.id, search_query("&created__date__gt=" + datetime.datetime(2020, 1, 2).strftime("%Y-%m-%d")))
+
+        self.assertIn(d5.id, search_query("&added__date__lt=" + datetime.datetime(2020, 9, 2).strftime("%Y-%m-%d")))
+        self.assertNotIn(d5.id, search_query("&added__date__gt=" + datetime.datetime(2020, 9, 2).strftime("%Y-%m-%d")))
+
+        self.assertNotIn(d5.id, search_query("&added__date__lt=" + datetime.datetime(2020, 1, 2).strftime("%Y-%m-%d")))
+        self.assertIn(d5.id, search_query("&added__date__gt=" + datetime.datetime(2020, 1, 2).strftime("%Y-%m-%d")))
+
     def test_statistics(self):
 
         doc1 = Document.objects.create(title="none1", checksum="A")
@@ -1375,8 +1392,7 @@ class TestApiAuth(APITestCase):
         self.assertEqual(self.client.get("/api/logs/").status_code, 401)
         self.assertEqual(self.client.get("/api/saved_views/").status_code, 401)
 
-        self.assertEqual(self.client.get("/api/search/").status_code, 401)
-        self.assertEqual(self.client.get("/api/search/auto_complete/").status_code, 401)
+        self.assertEqual(self.client.get("/api/search/autocomplete/").status_code, 401)
         self.assertEqual(self.client.get("/api/documents/bulk_edit/").status_code, 401)
         self.assertEqual(self.client.get("/api/documents/bulk_download/").status_code, 401)
         self.assertEqual(self.client.get("/api/documents/selection_data/").status_code, 401)

src/documents/tests/test_index.py

@@ -1,20 +1,10 @@
 from django.test import TestCase
 
 from documents import index
-from documents.index import JsonFormatter
 from documents.models import Document
 from documents.tests.utils import DirectoriesMixin
 
 
-class JsonFormatterTest(TestCase):
-
-    def setUp(self) -> None:
-        self.formatter = JsonFormatter()
-
-    def test_empty_fragments(self):
-        self.assertListEqual(self.formatter.format([]), [])
-
-
 class TestAutoComplete(DirectoriesMixin, TestCase):
 
     def test_auto_complete(self):

src/documents/tests/test_management_exporter.py

@@ -69,7 +69,7 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         manifest = self._do_export(use_filename_format=use_filename_format)
 
-        self.assertEqual(len(manifest), 7)
+        self.assertEqual(len(manifest), 8)
         self.assertEqual(len(list(filter(lambda e: e['model'] == 'documents.document', manifest))), 4)
 
         self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json")))

src/documents/tests/test_migration_remove_null_characters.py

@@ -0,0 +1,15 @@
+from documents.tests.utils import DirectoriesMixin, TestMigrations
+
+
+class TestMigrateNullCharacters(DirectoriesMixin, TestMigrations):
+
+    migrate_from = '1014_auto_20210228_1614'
+    migrate_to = '1015_remove_null_characters'
+
+    def setUpBeforeMigration(self, apps):
+        Document = apps.get_model("documents", "Document")
+        self.doc = Document.objects.create(content="aaa\0bbb")
+
+    def testMimeTypesMigrated(self):
+        Document = self.apps.get_model('documents', 'Document')
+        self.assertNotIn("\0", Document.objects.get(id=self.doc.id).content)

src/documents/tests/test_views.py

@@ -15,7 +15,7 @@ class TestViews(TestCase):
 
     def test_index(self):
         self.client.force_login(self.user)
-        for (language_given, language_actual) in [("", "en-US"), ("en-US", "en-US"), ("de", "de"), ("en", "en-US"), ("en-us", "en-US"), ("fr", "fr"), ("jp", "en-US")]:
+        for (language_given, language_actual) in [("", "en-US"), ("en-US", "en-US"), ("de", "de-DE"), ("en", "en-US"), ("en-us", "en-US"), ("fr", "fr-FR"), ("jp", "en-US")]:
             if language_given:
                 self.client.cookies.load({settings.LANGUAGE_COOKIE_NAME: language_given})
             elif settings.LANGUAGE_COOKIE_NAME in self.client.cookies.keys():

src/documents/views.py

@@ -17,7 +17,9 @@ from django_filters.rest_framework import DjangoFilterBackend
 from django_q.tasks import async_task
 from rest_framework import parsers
 from rest_framework.decorators import action
+from rest_framework.exceptions import NotFound
 from rest_framework.filters import OrderingFilter, SearchFilter
+from rest_framework.generics import GenericAPIView
 from rest_framework.mixins import (
     DestroyModelMixin,
     ListModelMixin,
@@ -326,6 +328,70 @@ class DocumentViewSet(RetrieveModelMixin,
             raise Http404()
 
 
+class SearchResultSerializer(DocumentSerializer):
+
+    def to_representation(self, instance):
+        doc = Document.objects.get(id=instance['id'])
+        r = super(SearchResultSerializer, self).to_representation(doc)
+        r['__search_hit__'] = {
+            "score": instance.score,
+            "highlights": instance.highlights("content",
+                                   text=doc.content) if doc else None,  # NOQA: E501
+            "rank": instance.rank
+        }
+
+        return r
+
+
+class UnifiedSearchViewSet(DocumentViewSet):
+
+    def __init__(self, *args, **kwargs):
+        super(UnifiedSearchViewSet, self).__init__(*args, **kwargs)
+        self.searcher = None
+
+    def get_serializer_class(self):
+        if self._is_search_request():
+            return SearchResultSerializer
+        else:
+            return DocumentSerializer
+
+    def _is_search_request(self):
+        return ("query" in self.request.query_params or
+                "more_like_id" in self.request.query_params)
+
+    def filter_queryset(self, queryset):
+        if self._is_search_request():
+            from documents import index
+
+            if "query" in self.request.query_params:
+                query_class = index.DelayedFullTextQuery
+            elif "more_like_id" in self.request.query_params:
+                query_class = index.DelayedMoreLikeThisQuery
+            else:
+                raise ValueError()
+
+            return query_class(
+                self.searcher,
+                self.request.query_params,
+                self.paginator.get_page_size(self.request))
+        else:
+            return super(UnifiedSearchViewSet, self).filter_queryset(queryset)
+
+    def list(self, request, *args, **kwargs):
+        if self._is_search_request():
+            from documents import index
+            try:
+                with index.open_index_searcher() as s:
+                    self.searcher = s
+                    return super(UnifiedSearchViewSet, self).list(request)
+            except NotFound:
+                raise
+            except Exception as e:
+                return HttpResponseBadRequest(str(e))
+        else:
+            return super(UnifiedSearchViewSet, self).list(request)
+
+
 class LogViewSet(ViewSet):
 
     permission_classes = (IsAuthenticated,)
@@ -366,23 +432,12 @@ class SavedViewViewSet(ModelViewSet):
         serializer.save(user=self.request.user)
 
 
-class BulkEditView(APIView):
+class BulkEditView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = BulkEditSerializer
     parser_classes = (parsers.JSONParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -399,23 +454,12 @@ class BulkEditView(APIView):
             return HttpResponseBadRequest(str(e))
 
 
-class PostDocumentView(APIView):
+class PostDocumentView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = PostDocumentSerializer
     parser_classes = (parsers.MultiPartParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
 
         serializer = self.get_serializer(data=request.data)
@@ -453,23 +497,12 @@ class PostDocumentView(APIView):
         return Response("OK")
 
 
-class SelectionDataView(APIView):
+class SelectionDataView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = DocumentListSerializer
     parser_classes = (parsers.MultiPartParser, parsers.JSONParser)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, format=None):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -510,74 +543,6 @@ class SelectionDataView(APIView):
         return r
 
 
-class SearchView(APIView):
-
-    permission_classes = (IsAuthenticated,)
-
-    def add_infos_to_hit(self, r):
-        try:
-            doc = Document.objects.get(id=r['id'])
-        except Document.DoesNotExist:
-            logger.warning(
-                f"Search index returned a non-existing document: "
-                f"id: {r['id']}, title: {r['title']}. "
-                f"Search index needs reindex."
-            )
-            doc = None
-
-        return {'id': r['id'],
-                'highlights': r.highlights("content", text=doc.content) if doc else None,  # NOQA: E501
-                'score': r.score,
-                'rank': r.rank,
-                'document': DocumentSerializer(doc).data if doc else None,
-                'title': r['title']
-                }
-
-    def get(self, request, format=None):
-        from documents import index
-
-        if 'query' in request.query_params:
-            query = request.query_params['query']
-        else:
-            query = None
-
-        if 'more_like' in request.query_params:
-            more_like_id = request.query_params['more_like']
-            more_like_content = Document.objects.get(id=more_like_id).content
-        else:
-            more_like_id = None
-            more_like_content = None
-
-        if not query and not more_like_id:
-            return Response({
-                'count': 0,
-                'page': 0,
-                'page_count': 0,
-                'corrected_query': None,
-                'results': []})
-
-        try:
-            page = int(request.query_params.get('page', 1))
-        except (ValueError, TypeError):
-            page = 1
-
-        if page < 1:
-            page = 1
-
-        ix = index.open_index()
-
-        try:
-            with index.query_page(ix, page, query, more_like_id, more_like_content) as (result_page, corrected_query):  # NOQA: E501
-                return Response(
-                    {'count': len(result_page),
-                     'page': result_page.pagenum,
-                     'page_count': result_page.pagecount,
-                     'corrected_query': corrected_query,
-                     'results': list(map(self.add_infos_to_hit, result_page))})
-        except Exception as e:
-            return HttpResponseBadRequest(str(e))
-
-
 class SearchAutoCompleteView(APIView):
 
     permission_classes = (IsAuthenticated,)
@@ -620,23 +585,12 @@ class StatisticsView(APIView):
         })
 
 
-class BulkDownloadView(APIView):
+class BulkDownloadView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = BulkDownloadSerializer
     parser_classes = (parsers.JSONParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, format=None):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)

src/locale/cs_CZ/LC_MESSAGES/django.po

@@ -1,357 +1,378 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Štěpán Šebestian <mys.orangeorange0123@gmail.com>, 2021
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: paperless-ng\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-28 22:02+0100\n"
-"PO-Revision-Date: 2020-12-30 19:27+0000\n"
-"Last-Translator: Štěpán Šebestian <mys.orangeorange0123@gmail.com>, 2021\n"
-"Language-Team: Czech (https://www.transifex.com/paperless/teams/115905/cs/)\n"
+"POT-Creation-Date: 2021-04-05 22:05+0200\n"
+"PO-Revision-Date: 2021-04-05 20:20\n"
+"Last-Translator: \n"
+"Language-Team: Czech\n"
+"Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Crowdin-Project: paperless-ng\n"
+"X-Crowdin-Project-ID: 434940\n"
+"X-Crowdin-Language: cs\n"
+"X-Crowdin-File: /dev/src/locale/en_US/LC_MESSAGES/django.po\n"
+"X-Crowdin-File-ID: 54\n"
 
 #: documents/apps.py:10
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr "Jakékoliv slovo"
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr "Všechna slova"
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr "Přesná shoda"
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr "Regulární výraz"
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr "Fuzzy slovo"
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr "Automatický"
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:350 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr "název"
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr "shoda"
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr "algoritmus pro shodu"
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr "je ignorováno"
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:120
 msgid "correspondent"
 msgstr "korespondent"
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr "korespondenti"
 
-#: documents/models.py:98
+#: documents/models.py:81
 msgid "color"
 msgstr "barva"
 
-#: documents/models.py:102
+#: documents/models.py:87
 msgid "is inbox tag"
 msgstr "tag přichozí"
 
-#: documents/models.py:104
-msgid ""
-"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
-"with inbox tags."
-msgstr ""
-"Označí tento tag jako tag pro příchozí: Všechny nově zkonzumované dokumenty "
-"budou označeny tagem pro přichozí"
+#: documents/models.py:89
+msgid "Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags."
+msgstr "Označí tento tag jako tag pro příchozí: Všechny nově zkonzumované dokumenty budou označeny tagem pro přichozí"
 
-#: documents/models.py:109
+#: documents/models.py:94
 msgid "tag"
 msgstr "tag"
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:95 documents/models.py:151
 msgid "tags"
 msgstr "tagy"
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:101 documents/models.py:133
 msgid "document type"
 msgstr "typ dokumentu"
 
-#: documents/models.py:117
+#: documents/models.py:102
 msgid "document types"
 msgstr "typy dokumentu"
 
-#: documents/models.py:125
+#: documents/models.py:110
 msgid "Unencrypted"
 msgstr "Nešifrované"
 
-#: documents/models.py:126
+#: documents/models.py:111
 msgid "Encrypted with GNU Privacy Guard"
 msgstr "Šifrované pomocí GNU Privacy Guard"
 
-#: documents/models.py:139
+#: documents/models.py:124
 msgid "title"
 msgstr "titulek"
 
-#: documents/models.py:152
+#: documents/models.py:137
 msgid "content"
 msgstr "obsah"
 
-#: documents/models.py:154
-msgid ""
-"The raw, text-only data of the document. This field is primarily used for "
-"searching."
-msgstr ""
-"Nezpracovaná, pouze textová data dokumentu. Toto pole je používáno především"
-" pro vyhledávání."
+#: documents/models.py:139
+msgid "The raw, text-only data of the document. This field is primarily used for searching."
+msgstr "Nezpracovaná, pouze textová data dokumentu. Toto pole je používáno především pro vyhledávání."
 
-#: documents/models.py:159
+#: documents/models.py:144
 msgid "mime type"
 msgstr "mime typ"
 
-#: documents/models.py:170
+#: documents/models.py:155
 msgid "checksum"
 msgstr "kontrolní součet"
 
-#: documents/models.py:174
+#: documents/models.py:159
 msgid "The checksum of the original document."
 msgstr "Kontrolní součet původního dokumentu"
 
-#: documents/models.py:178
+#: documents/models.py:163
 msgid "archive checksum"
 msgstr "kontrolní součet archivu"
 
-#: documents/models.py:183
+#: documents/models.py:168
 msgid "The checksum of the archived document."
 msgstr "Kontrolní součet archivovaného dokumentu."
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:172 documents/models.py:328
 msgid "created"
 msgstr "vytvořeno"
 
-#: documents/models.py:191
+#: documents/models.py:176
 msgid "modified"
 msgstr "upraveno"
 
-#: documents/models.py:195
+#: documents/models.py:180
 msgid "storage type"
 msgstr "typ úložiště"
 
-#: documents/models.py:203
+#: documents/models.py:188
 msgid "added"
 msgstr "přidáno"
 
-#: documents/models.py:207
+#: documents/models.py:192
 msgid "filename"
 msgstr "název souboru"
 
-#: documents/models.py:212
+#: documents/models.py:198
 msgid "Current filename in storage"
 msgstr "Aktuální název souboru v úložišti"
 
-#: documents/models.py:216
+#: documents/models.py:202
+msgid "archive filename"
+msgstr ""
+
+#: documents/models.py:208
+msgid "Current archive filename in storage"
+msgstr ""
+
+#: documents/models.py:212
 msgid "archive serial number"
 msgstr "sériové číslo archivu"
 
-#: documents/models.py:221
+#: documents/models.py:217
 msgid "The position of this document in your physical document archive."
 msgstr "Pozice dokumentu ve vašem archivu fyzických dokumentů"
 
-#: documents/models.py:227
+#: documents/models.py:223
 msgid "document"
 msgstr "dokument"
 
-#: documents/models.py:228
+#: documents/models.py:224
 msgid "documents"
 msgstr "dokumenty"
 
-#: documents/models.py:313
+#: documents/models.py:311
 msgid "debug"
 msgstr "debug"
 
-#: documents/models.py:314
+#: documents/models.py:312
 msgid "information"
 msgstr "informace"
 
-#: documents/models.py:315
+#: documents/models.py:313
 msgid "warning"
 msgstr "varování"
 
-#: documents/models.py:316
+#: documents/models.py:314
 msgid "error"
 msgstr "chyba"
 
-#: documents/models.py:317
+#: documents/models.py:315
 msgid "critical"
 msgstr "kritická"
 
-#: documents/models.py:321
+#: documents/models.py:319
 msgid "group"
 msgstr "skupina"
 
-#: documents/models.py:324
+#: documents/models.py:322
 msgid "message"
 msgstr "zpráva"
 
-#: documents/models.py:327
+#: documents/models.py:325
 msgid "level"
 msgstr "úroveň"
 
-#: documents/models.py:334
+#: documents/models.py:332
 msgid "log"
 msgstr "záznam"
 
-#: documents/models.py:335
+#: documents/models.py:333
 msgid "logs"
 msgstr "záznamy"
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:344 documents/models.py:401
 msgid "saved view"
 msgstr "uložený pohled"
 
-#: documents/models.py:347
+#: documents/models.py:345
 msgid "saved views"
 msgstr "uložené pohledy"
 
-#: documents/models.py:350
+#: documents/models.py:348
 msgid "user"
 msgstr "uživatel"
 
-#: documents/models.py:356
+#: documents/models.py:354
 msgid "show on dashboard"
 msgstr "zobrazit v dashboardu"
 
-#: documents/models.py:359
+#: documents/models.py:357
 msgid "show in sidebar"
 msgstr "zobrazit v postranním menu"
 
-#: documents/models.py:363
+#: documents/models.py:361
 msgid "sort field"
 msgstr "pole na řazení"
 
-#: documents/models.py:366
+#: documents/models.py:367
 msgid "sort reverse"
 msgstr "třídit opačně"
 
-#: documents/models.py:372
+#: documents/models.py:373
 msgid "title contains"
 msgstr "titulek obsahuje"
 
-#: documents/models.py:373
+#: documents/models.py:374
 msgid "content contains"
 msgstr "obsah obsahuje"
 
-#: documents/models.py:374
+#: documents/models.py:375
 msgid "ASN is"
 msgstr "ASN je"
 
-#: documents/models.py:375
+#: documents/models.py:376
 msgid "correspondent is"
 msgstr "korespondent je"
 
-#: documents/models.py:376
+#: documents/models.py:377
 msgid "document type is"
 msgstr "typ dokumentu je"
 
-#: documents/models.py:377
+#: documents/models.py:378
 msgid "is in inbox"
 msgstr "je v příchozích"
 
-#: documents/models.py:378
+#: documents/models.py:379
 msgid "has tag"
 msgstr "má tag"
 
-#: documents/models.py:379
+#: documents/models.py:380
 msgid "has any tag"
 msgstr "má jakýkoliv tag"
 
-#: documents/models.py:380
+#: documents/models.py:381
 msgid "created before"
 msgstr "vytvořeno před"
 
-#: documents/models.py:381
+#: documents/models.py:382
 msgid "created after"
 msgstr "vytvořeno po"
 
-#: documents/models.py:382
+#: documents/models.py:383
 msgid "created year is"
 msgstr "rok vytvoření je"
 
-#: documents/models.py:383
+#: documents/models.py:384
 msgid "created month is"
 msgstr "měsíc vytvoření je"
 
-#: documents/models.py:384
+#: documents/models.py:385
 msgid "created day is"
 msgstr "den vytvoření je"
 
-#: documents/models.py:385
+#: documents/models.py:386
 msgid "added before"
 msgstr "přidáno před"
 
-#: documents/models.py:386
+#: documents/models.py:387
 msgid "added after"
 msgstr "přidáno po"
 
-#: documents/models.py:387
+#: documents/models.py:388
 msgid "modified before"
 msgstr "upraveno před"
 
-#: documents/models.py:388
+#: documents/models.py:389
 msgid "modified after"
 msgstr "upraveno po"
 
-#: documents/models.py:389
+#: documents/models.py:390
 msgid "does not have tag"
 msgstr "nemá tag"
 
-#: documents/models.py:400
+#: documents/models.py:391
+msgid "does not have ASN"
+msgstr ""
+
+#: documents/models.py:392
+msgid "title or content contains"
+msgstr ""
+
+#: documents/models.py:393
+msgid "fulltext query"
+msgstr ""
+
+#: documents/models.py:394
+msgid "more like this"
+msgstr ""
+
+#: documents/models.py:405
 msgid "rule type"
 msgstr "typ pravidla"
 
-#: documents/models.py:404
+#: documents/models.py:409
 msgid "value"
 msgstr "hodnota"
 
-#: documents/models.py:410
+#: documents/models.py:415
 msgid "filter rule"
 msgstr "filtrovací pravidlo"
 
-#: documents/models.py:411
+#: documents/models.py:416
 msgid "filter rules"
 msgstr "filtrovací pravidla"
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:53
+#, python-format
+msgid "Invalid regular expression: %(error)s"
+msgstr ""
+
+#: documents/serialisers.py:177
+msgid "Invalid color."
+msgstr ""
+
+#: documents/serialisers.py:451
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr "Typ souboru %(type)s není podporován"
 
-#: documents/templates/index.html:20
+#: documents/templates/index.html:21
 msgid "Paperless-ng is loading..."
 msgstr "Paperless-ng se načítá..."
 
@@ -391,23 +412,51 @@ msgstr "Heslo"
 msgid "Sign in"
 msgstr "Přihlásit se"
 
-#: paperless/settings.py:286
-msgid "English"
-msgstr "Angličtina"
+#: paperless/settings.py:298
+msgid "English (US)"
+msgstr ""
 
-#: paperless/settings.py:287
+#: paperless/settings.py:299
+msgid "English (GB)"
+msgstr ""
+
+#: paperless/settings.py:300
 msgid "German"
 msgstr "Němčina"
 
-#: paperless/settings.py:288
+#: paperless/settings.py:301
 msgid "Dutch"
 msgstr "Holandština"
 
-#: paperless/settings.py:289
+#: paperless/settings.py:302
 msgid "French"
 msgstr "Francouzština"
 
-#: paperless/urls.py:114
+#: paperless/settings.py:303
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: paperless/settings.py:304
+msgid "Portuguese"
+msgstr ""
+
+#: paperless/settings.py:305
+msgid "Italian"
+msgstr ""
+
+#: paperless/settings.py:306
+msgid "Romanian"
+msgstr ""
+
+#: paperless/settings.py:307
+msgid "Russian"
+msgstr ""
+
+#: paperless/settings.py:308
+msgid "Spanish"
+msgstr ""
+
+#: paperless/urls.py:113
 msgid "Paperless-ng administration"
 msgstr "Správa Paperless-ng"
 
@@ -416,37 +465,24 @@ msgid "Filter"
 msgstr "Filtr"
 
 #: paperless_mail/admin.py:27
-msgid ""
-"Paperless will only process mails that match ALL of the filters given below."
-msgstr ""
-"Paperless zpracuje pouze emaily které odpovídají VŠEM níže zadaným filtrům."
+msgid "Paperless will only process mails that match ALL of the filters given below."
+msgstr "Paperless zpracuje pouze emaily které odpovídají VŠEM níže zadaným filtrům."
 
 #: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Akce"
 
 #: paperless_mail/admin.py:39
-msgid ""
-"The action applied to the mail. This action is only performed when documents"
-" were consumed from the mail. Mails without attachments will remain entirely"
-" untouched."
-msgstr ""
-"Akce provedena na emailu. Tato akce je provedena jen pokud byly dokumenty "
-"zkonzumovány z emailu. Emaily bez příloh zůstanou nedotčeny."
+msgid "The action applied to the mail. This action is only performed when documents were consumed from the mail. Mails without attachments will remain entirely untouched."
+msgstr "Akce provedena na emailu. Tato akce je provedena jen pokud byly dokumenty zkonzumovány z emailu. Emaily bez příloh zůstanou nedotčeny."
 
 #: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Metadata"
 
 #: paperless_mail/admin.py:48
-msgid ""
-"Assign metadata to documents consumed from this rule automatically. If you "
-"do not assign tags, types or correspondents here, paperless will still "
-"process all matching rules that you have defined."
-msgstr ""
-"Automaticky přiřadit metadata dokumentům zkonzumovaných z tohoto pravidla. "
-"Pokud zde nepřiřadíte tagy, typy nebo korespondenty, paperless stále "
-"zpracuje všechna shodující-se pravidla které jste definovali."
+msgid "Assign metadata to documents consumed from this rule automatically. If you do not assign tags, types or correspondents here, paperless will still process all matching rules that you have defined."
+msgstr "Automaticky přiřadit metadata dokumentům zkonzumovaných z tohoto pravidla. Pokud zde nepřiřadíte tagy, typy nebo korespondenty, paperless stále zpracuje všechna shodující-se pravidla které jste definovali."
 
 #: paperless_mail/apps.py:9
 msgid "Paperless mail"
@@ -481,12 +517,8 @@ msgid "IMAP port"
 msgstr "IMAP port"
 
 #: paperless_mail/models.py:36
-msgid ""
-"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
-"SSL connections."
-msgstr ""
-"Toto je většinou 143 pro nešifrovaná připojení/připojení používající "
-"STARTTLS a 993 pro SSL připojení."
+msgid "This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections."
+msgstr "Toto je většinou 143 pro nešifrovaná připojení/připojení používající STARTTLS a 993 pro SSL připojení."
 
 #: paperless_mail/models.py:40
 msgid "IMAP security"
@@ -585,13 +617,8 @@ msgid "filter attachment filename"
 msgstr "název souboru u přílohy filtru"
 
 #: paperless_mail/models.py:140
-msgid ""
-"Only consume documents which entirely match this filename if specified. "
-"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
-msgstr ""
-"Konzumovat jen dokumenty které přesně odpovídají tomuto názvu souboru pokud "
-"specifikováno. Zástupné znaky jako *.pdf nebo *invoice* jsou povoleny. "
-"Nezáleží na velikosti písmen."
+msgid "Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr "Konzumovat jen dokumenty které přesně odpovídají tomuto názvu souboru pokud specifikováno. Zástupné znaky jako *.pdf nebo *invoice* jsou povoleny. Nezáleží na velikosti písmen."
 
 #: paperless_mail/models.py:146
 msgid "maximum age"
@@ -606,12 +633,8 @@ msgid "attachment type"
 msgstr "typ přílohy"
 
 #: paperless_mail/models.py:154
-msgid ""
-"Inline attachments include embedded images, so it's best to combine this "
-"option with a filename filter."
-msgstr ""
-"Vložené přílohy zahrnují vložené obrázky, takže je nejlepší tuto možnost "
-"kombinovat s filtrem na název souboru"
+msgid "Inline attachments include embedded images, so it's best to combine this option with a filename filter."
+msgstr "Vložené přílohy zahrnují vložené obrázky, takže je nejlepší tuto možnost kombinovat s filtrem na název souboru"
 
 #: paperless_mail/models.py:159
 msgid "action"
@@ -622,12 +645,8 @@ msgid "action parameter"
 msgstr "parametr akce"
 
 #: paperless_mail/models.py:167
-msgid ""
-"Additional parameter for the action selected above, i.e., the target folder "
-"of the move to folder action."
-msgstr ""
-"Další parametr pro výše vybranou akci, napříkad cílová složka akce přesunutí"
-" do složky."
+msgid "Additional parameter for the action selected above, i.e., the target folder of the move to folder action."
+msgstr "Další parametr pro výše vybranou akci, napříkad cílová složka akce přesunutí do složky."
 
 #: paperless_mail/models.py:173
 msgid "assign title from"
@@ -648,3 +667,4 @@ msgstr "přiřadit korespondenta z"
 #: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "přiřadit tohoto korespondenta"
+

src/locale/de_DE/LC_MESSAGES/django.po

@@ -1,25 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Jonas Winkler, 2021
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: paperless-ng\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 12:40+0100\n"
-"PO-Revision-Date: 2021-02-16 18:37+0000\n"
-"Last-Translator: Jonas Winkler, 2021\n"
-"Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n"
+"POT-Creation-Date: 2021-04-05 22:05+0200\n"
+"PO-Revision-Date: 2021-04-05 20:20\n"
+"Last-Translator: \n"
+"Language-Team: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: paperless-ng\n"
+"X-Crowdin-Project-ID: 434940\n"
+"X-Crowdin-Language: de\n"
+"X-Crowdin-File: /dev/src/locale/en_US/LC_MESSAGES/django.po\n"
+"X-Crowdin-File-ID: 54\n"
 
 #: documents/apps.py:10
 msgid "Documents"
@@ -83,12 +79,8 @@ msgid "is inbox tag"
 msgstr "Posteingangs-Tag"
 
 #: documents/models.py:89
-msgid ""
-"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
-"with inbox tags."
-msgstr ""
-"Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit "
-"diesem Tag versehen."
+msgid "Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags."
+msgstr "Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit diesem Tag versehen."
 
 #: documents/models.py:94
 msgid "tag"
@@ -123,12 +115,8 @@ msgid "content"
 msgstr "Inhalt"
 
 #: documents/models.py:139
-msgid ""
-"The raw, text-only data of the document. This field is primarily used for "
-"searching."
-msgstr ""
-"Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche "
-"verwendet."
+msgid "The raw, text-only data of the document. This field is primarily used for searching."
+msgstr "Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche verwendet."
 
 #: documents/models.py:144
 msgid "mime type"
@@ -238,7 +226,7 @@ msgstr "Protokoll"
 msgid "logs"
 msgstr "Protokoll"
 
-#: documents/models.py:344 documents/models.py:394
+#: documents/models.py:344 documents/models.py:401
 msgid "saved view"
 msgstr "Gespeicherte Ansicht"
 
@@ -262,101 +250,117 @@ msgstr "In Seitenleiste zeigen"
 msgid "sort field"
 msgstr "Sortierfeld"
 
-#: documents/models.py:364
+#: documents/models.py:367
 msgid "sort reverse"
 msgstr "Umgekehrte Sortierung"
 
-#: documents/models.py:370
+#: documents/models.py:373
 msgid "title contains"
 msgstr "Titel enthält"
 
-#: documents/models.py:371
+#: documents/models.py:374
 msgid "content contains"
 msgstr "Inhalt enthält"
 
-#: documents/models.py:372
+#: documents/models.py:375
 msgid "ASN is"
 msgstr "ASN ist"
 
-#: documents/models.py:373
+#: documents/models.py:376
 msgid "correspondent is"
 msgstr "Korrespondent ist"
 
-#: documents/models.py:374
+#: documents/models.py:377
 msgid "document type is"
 msgstr "Dokumenttyp ist"
 
-#: documents/models.py:375
+#: documents/models.py:378
 msgid "is in inbox"
 msgstr "Ist im Posteingang"
 
-#: documents/models.py:376
+#: documents/models.py:379
 msgid "has tag"
 msgstr "Hat Tag"
 
-#: documents/models.py:377
+#: documents/models.py:380
 msgid "has any tag"
 msgstr "Hat irgendein Tag"
 
-#: documents/models.py:378
+#: documents/models.py:381
 msgid "created before"
 msgstr "Ausgestellt vor"
 
-#: documents/models.py:379
+#: documents/models.py:382
 msgid "created after"
 msgstr "Ausgestellt nach"
 
-#: documents/models.py:380
+#: documents/models.py:383
 msgid "created year is"
 msgstr "Ausgestellt im Jahr"
 
-#: documents/models.py:381
+#: documents/models.py:384
 msgid "created month is"
 msgstr "Ausgestellt im Monat"
 
-#: documents/models.py:382
+#: documents/models.py:385
 msgid "created day is"
 msgstr "Ausgestellt am Tag"
 
-#: documents/models.py:383
+#: documents/models.py:386
 msgid "added before"
 msgstr "Hinzugefügt vor"
 
-#: documents/models.py:384
+#: documents/models.py:387
 msgid "added after"
 msgstr "Hinzugefügt nach"
 
-#: documents/models.py:385
+#: documents/models.py:388
 msgid "modified before"
 msgstr "Geändert vor"
 
-#: documents/models.py:386
+#: documents/models.py:389
 msgid "modified after"
 msgstr "Geändert nach"
 
-#: documents/models.py:387
+#: documents/models.py:390
 msgid "does not have tag"
 msgstr "Hat nicht folgendes Tag"
 
-#: documents/models.py:398
+#: documents/models.py:391
+msgid "does not have ASN"
+msgstr "Dokument hat keine ASN"
+
+#: documents/models.py:392
+msgid "title or content contains"
+msgstr "Titel oder Inhalt enthält"
+
+#: documents/models.py:393
+msgid "fulltext query"
+msgstr ""
+
+#: documents/models.py:394
+msgid "more like this"
+msgstr ""
+
+#: documents/models.py:405
 msgid "rule type"
 msgstr "Regeltyp"
 
-#: documents/models.py:402
+#: documents/models.py:409
 msgid "value"
 msgstr "Wert"
 
-#: documents/models.py:408
+#: documents/models.py:415
 msgid "filter rule"
 msgstr "Filterregel"
 
-#: documents/models.py:409
+#: documents/models.py:416
 msgid "filter rules"
 msgstr "Filterregeln"
 
 #: documents/serialisers.py:53
 #, python-format
-msgid "Invalid regular expresssion: %(error)s"
+msgid "Invalid regular expression: %(error)s"
 msgstr "Ungültiger regulärer Ausdruck: %(error)s"
 
 #: documents/serialisers.py:177
@@ -394,9 +398,7 @@ msgstr "Bitte melden Sie sich an."
 
 #: documents/templates/registration/login.html:45
 msgid "Your username and password didn't match. Please try again."
-msgstr ""
-"Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es "
-"erneut."
+msgstr "Ihr Benutzername und Kennwort stimmen nicht überein. Bitte versuchen Sie es erneut."
 
 #: documents/templates/registration/login.html:48
 msgid "Username"
@@ -404,45 +406,57 @@ msgstr "Benutzername"
 
 #: documents/templates/registration/login.html:49
 msgid "Password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: documents/templates/registration/login.html:54
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: paperless/settings.py:297
+#: paperless/settings.py:298
 msgid "English (US)"
 msgstr "Englisch (US)"
 
-#: paperless/settings.py:298
+#: paperless/settings.py:299
 msgid "English (GB)"
 msgstr "Englisch (UK)"
 
-#: paperless/settings.py:299
+#: paperless/settings.py:300
 msgid "German"
 msgstr "Deutsch"
 
-#: paperless/settings.py:300
+#: paperless/settings.py:301
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: paperless/settings.py:301
+#: paperless/settings.py:302
 msgid "French"
 msgstr "Französisch"
 
-#: paperless/settings.py:302
+#: paperless/settings.py:303
 msgid "Portuguese (Brazil)"
 msgstr "Portugiesisch (Brasilien)"
 
-#: paperless/settings.py:303
+#: paperless/settings.py:304
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: paperless/settings.py:305
 msgid "Italian"
 msgstr "Italienisch"
 
-#: paperless/settings.py:304
+#: paperless/settings.py:306
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: paperless/urls.py:118
+#: paperless/settings.py:307
+msgid "Russian"
+msgstr "Russisch"
+
+#: paperless/settings.py:308
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: paperless/urls.py:113
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng Administration"
 
@@ -451,40 +465,24 @@ msgid "Filter"
 msgstr "Filter"
 
 #: paperless_mail/admin.py:27
-msgid ""
-"Paperless will only process mails that match ALL of the filters given below."
-msgstr ""
-"Paperless wird nur E-Mails verarbeiten, für die alle der hier angegebenen "
-"Filter zutreffen."
+msgid "Paperless will only process mails that match ALL of the filters given below."
+msgstr "Paperless wird nur E-Mails verarbeiten, für die alle der hier angegebenen Filter zutreffen."
 
 #: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Aktionen"
 
 #: paperless_mail/admin.py:39
-msgid ""
-"The action applied to the mail. This action is only performed when documents"
-" were consumed from the mail. Mails without attachments will remain entirely"
-" untouched."
-msgstr ""
-"Die Aktion, die auf E-Mails angewendet werden soll. Diese Aktion wird nur "
-"auf E-Mails angewendet, aus denen Anhänge verarbeitet wurden. E-Mails ohne "
-"Anhänge werden vollständig ignoriert."
+msgid "The action applied to the mail. This action is only performed when documents were consumed from the mail. Mails without attachments will remain entirely untouched."
+msgstr "Die Aktion, die auf E-Mails angewendet werden soll. Diese Aktion wird nur auf E-Mails angewendet, aus denen Anhänge verarbeitet wurden. E-Mails ohne Anhänge werden vollständig ignoriert."
 
 #: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Metadaten"
 
 #: paperless_mail/admin.py:48
-msgid ""
-"Assign metadata to documents consumed from this rule automatically. If you "
-"do not assign tags, types or correspondents here, paperless will still "
-"process all matching rules that you have defined."
-msgstr ""
-"Folgende Metadaten werden Dokumenten dieser Regel automatisch zugewiesen. "
-"Wenn Sie hier nichts auswählen wird Paperless weiterhin alle "
-"Zuweisungsalgorithmen ausführen und Metadaten auf Basis des Dokumentinhalts "
-"zuweisen."
+msgid "Assign metadata to documents consumed from this rule automatically. If you do not assign tags, types or correspondents here, paperless will still process all matching rules that you have defined."
+msgstr "Folgende Metadaten werden Dokumenten dieser Regel automatisch zugewiesen. Wenn Sie hier nichts auswählen wird Paperless weiterhin alle Zuweisungsalgorithmen ausführen und Metadaten auf Basis des Dokumentinhalts zuweisen."
 
 #: paperless_mail/apps.py:9
 msgid "Paperless mail"
@@ -519,12 +517,8 @@ msgid "IMAP port"
 msgstr "IMAP-Port"
 
 #: paperless_mail/models.py:36
-msgid ""
-"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
-"SSL connections."
-msgstr ""
-"Dies ist in der Regel 143 für unverschlüsselte und STARTTLS-Verbindungen und"
-" 993 für SSL-Verbindungen."
+msgid "This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections."
+msgstr "Dies ist in der Regel 143 für unverschlüsselte und STARTTLS-Verbindungen und 993 für SSL-Verbindungen."
 
 #: paperless_mail/models.py:40
 msgid "IMAP security"
@@ -536,7 +530,7 @@ msgstr "Benutzername"
 
 #: paperless_mail/models.py:50
 msgid "password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: paperless_mail/models.py:60
 msgid "mail rule"
@@ -623,13 +617,8 @@ msgid "filter attachment filename"
 msgstr "Anhang-Dateiname filtern"
 
 #: paperless_mail/models.py:140
-msgid ""
-"Only consume documents which entirely match this filename if specified. "
-"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
-msgstr ""
-"Wenn angegeben werden nur Dateien verarbeitet, die diesem Dateinamen exakt "
-"entsprechen. Platzhalter wie *.pdf oder *rechnung* sind erlaubt. Groß- und "
-"Kleinschreibung ist irrelevant."
+msgid "Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr "Wenn angegeben werden nur Dateien verarbeitet, die diesem Dateinamen exakt entsprechen. Platzhalter wie *.pdf oder *rechnung* sind erlaubt. Groß- und Kleinschreibung ist irrelevant."
 
 #: paperless_mail/models.py:146
 msgid "maximum age"
@@ -644,12 +633,8 @@ msgid "attachment type"
 msgstr "Dateianhangstyp"
 
 #: paperless_mail/models.py:154
-msgid ""
-"Inline attachments include embedded images, so it's best to combine this "
-"option with a filename filter."
-msgstr ""
-"'Inline'-Anhänge schließen eingebettete Bilder mit ein, daher sollte diese "
-"Einstellung mit einem Dateinamenfilter kombiniert werden."
+msgid "Inline attachments include embedded images, so it's best to combine this option with a filename filter."
+msgstr "'Inline'-Anhänge schließen eingebettete Bilder mit ein, daher sollte diese Einstellung mit einem Dateinamenfilter kombiniert werden."
 
 #: paperless_mail/models.py:159
 msgid "action"
@@ -660,12 +645,8 @@ msgid "action parameter"
 msgstr "Parameter für Aktion"
 
 #: paperless_mail/models.py:167
-msgid ""
-"Additional parameter for the action selected above, i.e., the target folder "
-"of the move to folder action."
-msgstr ""
-"Zusätzlicher Parameter für die oben ausgewählte Aktion, zum Beispiel der "
-"Zielordner für die Aktion \"In angegebenen Ordner verschieben\""
+msgid "Additional parameter for the action selected above, i.e., the target folder of the move to folder action."
+msgstr "Zusätzlicher Parameter für die oben ausgewählte Aktion, zum Beispiel der Zielordner für die Aktion \"In angegebenen Ordner verschieben\"."
 
 #: paperless_mail/models.py:173
 msgid "assign title from"
@@ -686,3 +667,4 @@ msgstr "Korrespondent zuweisen von"
 #: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "Diesen Korrespondent zuweisen"
+

src/locale/en_GB/LC_MESSAGES/django.po

@@ -1,26 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Ali Bates, 2021
-# Jonas Winkler, 2021
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: paperless-ng\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 12:40+0100\n"
-"PO-Revision-Date: 2021-02-16 18:37+0000\n"
-"Last-Translator: Jonas Winkler, 2021\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/paperless/teams/115905/en_GB/)\n"
+"POT-Creation-Date: 2021-04-05 22:05+0200\n"
+"PO-Revision-Date: 2021-04-05 20:20\n"
+"Last-Translator: \n"
+"Language-Team: English, United Kingdom\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: paperless-ng\n"
+"X-Crowdin-Project-ID: 434940\n"
+"X-Crowdin-Language: en-GB\n"
+"X-Crowdin-File: /dev/src/locale/en_US/LC_MESSAGES/django.po\n"
+"X-Crowdin-File-ID: 54\n"
 
 #: documents/apps.py:10
 msgid "Documents"
@@ -84,12 +79,8 @@ msgid "is inbox tag"
 msgstr "is inbox tag"
 
 #: documents/models.py:89
-msgid ""
-"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
-"with inbox tags."
-msgstr ""
-"Marks this tag as an inbox tag: All newly consumed documents will be tagged "
-"with inbox tags."
+msgid "Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags."
+msgstr "Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags."
 
 #: documents/models.py:94
 msgid "tag"
@@ -124,12 +115,8 @@ msgid "content"
 msgstr "content"
 
 #: documents/models.py:139
-msgid ""
-"The raw, text-only data of the document. This field is primarily used for "
-"searching."
-msgstr ""
-"The raw, text-only data of the document. This field is primarily used for "
-"searching."
+msgid "The raw, text-only data of the document. This field is primarily used for searching."
+msgstr "The raw, text-only data of the document. This field is primarily used for searching."
 
 #: documents/models.py:144
 msgid "mime type"
@@ -239,7 +226,7 @@ msgstr "log"
 msgid "logs"
 msgstr "logs"
 
-#: documents/models.py:344 documents/models.py:394
+#: documents/models.py:344 documents/models.py:401
 msgid "saved view"
 msgstr "saved view"
 
@@ -263,102 +250,118 @@ msgstr "show in sidebar"
 msgid "sort field"
 msgstr "sort field"
 
-#: documents/models.py:364
+#: documents/models.py:367
 msgid "sort reverse"
 msgstr "sort reverse"
 
-#: documents/models.py:370
+#: documents/models.py:373
 msgid "title contains"
 msgstr "title contains"
 
-#: documents/models.py:371
+#: documents/models.py:374
 msgid "content contains"
 msgstr "content contains"
 
-#: documents/models.py:372
+#: documents/models.py:375
 msgid "ASN is"
 msgstr "ASN is"
 
-#: documents/models.py:373
+#: documents/models.py:376
 msgid "correspondent is"
 msgstr "correspondent is"
 
-#: documents/models.py:374
+#: documents/models.py:377
 msgid "document type is"
 msgstr "document type is"
 
-#: documents/models.py:375
+#: documents/models.py:378
 msgid "is in inbox"
 msgstr "is in inbox"
 
-#: documents/models.py:376
+#: documents/models.py:379
 msgid "has tag"
 msgstr "has tag"
 
-#: documents/models.py:377
+#: documents/models.py:380
 msgid "has any tag"
 msgstr "has any tag"
 
-#: documents/models.py:378
+#: documents/models.py:381
 msgid "created before"
 msgstr "created before"
 
-#: documents/models.py:379
+#: documents/models.py:382
 msgid "created after"
 msgstr "created after"
 
-#: documents/models.py:380
+#: documents/models.py:383
 msgid "created year is"
 msgstr "created year is"
 
-#: documents/models.py:381
+#: documents/models.py:384
 msgid "created month is"
 msgstr "created month is"
 
-#: documents/models.py:382
+#: documents/models.py:385
 msgid "created day is"
 msgstr "created day is"
 
-#: documents/models.py:383
+#: documents/models.py:386
 msgid "added before"
 msgstr "added before"
 
-#: documents/models.py:384
+#: documents/models.py:387
 msgid "added after"
 msgstr "added after"
 
-#: documents/models.py:385
+#: documents/models.py:388
 msgid "modified before"
 msgstr "modified before"
 
-#: documents/models.py:386
+#: documents/models.py:389
 msgid "modified after"
 msgstr "modified after"
 
-#: documents/models.py:387
+#: documents/models.py:390
 msgid "does not have tag"
 msgstr "does not have tag"
 
-#: documents/models.py:398
+#: documents/models.py:391
+msgid "does not have ASN"
+msgstr "does not have ASN"
+
+#: documents/models.py:392
+msgid "title or content contains"
+msgstr "title or content contains"
+
+#: documents/models.py:393
+msgid "fulltext query"
+msgstr ""
+
+#: documents/models.py:394
+msgid "more like this"
+msgstr ""
+
+#: documents/models.py:405
 msgid "rule type"
 msgstr "rule type"
 
-#: documents/models.py:402
+#: documents/models.py:409
 msgid "value"
 msgstr "value"
 
-#: documents/models.py:408
+#: documents/models.py:415
 msgid "filter rule"
 msgstr "filter rule"
 
-#: documents/models.py:409
+#: documents/models.py:416
 msgid "filter rules"
 msgstr "filter rules"
 
 #: documents/serialisers.py:53
 #, python-format
-msgid "Invalid regular expresssion: %(error)s"
-msgstr "Invalid regular expresssion: %(error)s"
+msgid "Invalid regular expression: %(error)s"
+msgstr "Invalid regular expression: %(error)s"
 
 #: documents/serialisers.py:177
 msgid "Invalid color."
@@ -409,39 +412,51 @@ msgstr "Password"
 msgid "Sign in"
 msgstr "Sign in"
 
-#: paperless/settings.py:297
+#: paperless/settings.py:298
 msgid "English (US)"
 msgstr "English (US)"
 
-#: paperless/settings.py:298
+#: paperless/settings.py:299
 msgid "English (GB)"
 msgstr "English (GB)"
 
-#: paperless/settings.py:299
+#: paperless/settings.py:300
 msgid "German"
 msgstr "German"
 
-#: paperless/settings.py:300
+#: paperless/settings.py:301
 msgid "Dutch"
 msgstr "Dutch"
 
-#: paperless/settings.py:301
+#: paperless/settings.py:302
 msgid "French"
 msgstr "French"
 
-#: paperless/settings.py:302
+#: paperless/settings.py:303
 msgid "Portuguese (Brazil)"
 msgstr "Portuguese (Brazil)"
 
-#: paperless/settings.py:303
+#: paperless/settings.py:304
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: paperless/settings.py:305
 msgid "Italian"
 msgstr "Italian"
 
-#: paperless/settings.py:304
+#: paperless/settings.py:306
 msgid "Romanian"
 msgstr "Romanian"
 
-#: paperless/urls.py:118
+#: paperless/settings.py:307
+msgid "Russian"
+msgstr "Russian"
+
+#: paperless/settings.py:308
+msgid "Spanish"
+msgstr "Spanish"
+
+#: paperless/urls.py:113
 msgid "Paperless-ng administration"
 msgstr "Paperless-ng administration"
 
@@ -450,38 +465,24 @@ msgid "Filter"
 msgstr "Filter"
 
 #: paperless_mail/admin.py:27
-msgid ""
-"Paperless will only process mails that match ALL of the filters given below."
-msgstr ""
-"Paperless will only process mails that match ALL of the filters given below."
+msgid "Paperless will only process mails that match ALL of the filters given below."
+msgstr "Paperless will only process mails that match ALL of the filters given below."
 
 #: paperless_mail/admin.py:37
 msgid "Actions"
 msgstr "Actions"
 
 #: paperless_mail/admin.py:39
-msgid ""
-"The action applied to the mail. This action is only performed when documents"
-" were consumed from the mail. Mails without attachments will remain entirely"
-" untouched."
-msgstr ""
-"The action applied to the mail. This action is only performed when documents"
-" were consumed from the mail. Mails without attachments will remain entirely"
-" untouched."
+msgid "The action applied to the mail. This action is only performed when documents were consumed from the mail. Mails without attachments will remain entirely untouched."
+msgstr "The action applied to the mail. This action is only performed when documents were consumed from the mail. Mails without attachments will remain entirely untouched."
 
 #: paperless_mail/admin.py:46
 msgid "Metadata"
 msgstr "Metadata"
 
 #: paperless_mail/admin.py:48
-msgid ""
-"Assign metadata to documents consumed from this rule automatically. If you "
-"do not assign tags, types or correspondents here, paperless will still "
-"process all matching rules that you have defined."
-msgstr ""
-"Assign metadata to documents consumed from this rule automatically. If you "
-"do not assign tags, types or correspondents here, paperless will still "
-"process all matching rules that you have defined."
+msgid "Assign metadata to documents consumed from this rule automatically. If you do not assign tags, types or correspondents here, paperless will still process all matching rules that you have defined."
+msgstr "Assign metadata to documents consumed from this rule automatically. If you do not assign tags, types or correspondents here, paperless will still process all matching rules that you have defined."
 
 #: paperless_mail/apps.py:9
 msgid "Paperless mail"
@@ -516,12 +517,8 @@ msgid "IMAP port"
 msgstr "IMAP port"
 
 #: paperless_mail/models.py:36
-msgid ""
-"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
-"SSL connections."
-msgstr ""
-"This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
-"SSL connections."
+msgid "This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections."
+msgstr "This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections."
 
 #: paperless_mail/models.py:40
 msgid "IMAP security"
@@ -620,12 +617,8 @@ msgid "filter attachment filename"
 msgstr "filter attachment filename"
 
 #: paperless_mail/models.py:140
-msgid ""
-"Only consume documents which entirely match this filename if specified. "
-"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
-msgstr ""
-"Only consume documents which entirely match this filename if specified. "
-"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgid "Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
+msgstr "Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
 
 #: paperless_mail/models.py:146
 msgid "maximum age"
@@ -640,12 +633,8 @@ msgid "attachment type"
 msgstr "attachment type"
 
 #: paperless_mail/models.py:154
-msgid ""
-"Inline attachments include embedded images, so it's best to combine this "
-"option with a filename filter."
-msgstr ""
-"Inline attachments include embedded images, so it's best to combine this "
-"option with a filename filter."
+msgid "Inline attachments include embedded images, so it's best to combine this option with a filename filter."
+msgstr "Inline attachments include embedded images, so it's best to combine this option with a filename filter."
 
 #: paperless_mail/models.py:159
 msgid "action"
@@ -656,12 +645,8 @@ msgid "action parameter"
 msgstr "action parameter"
 
 #: paperless_mail/models.py:167
-msgid ""
-"Additional parameter for the action selected above, i.e., the target folder "
-"of the move to folder action."
-msgstr ""
-"Additional parameter for the action selected above, i.e., the target folder "
-"of the move to folder action."
+msgid "Additional parameter for the action selected above, i.e., the target folder of the move to folder action."
+msgstr "Additional parameter for the action selected above, i.e., the target folder of the move to folder action."
 
 #: paperless_mail/models.py:173
 msgid "assign title from"
@@ -682,3 +667,4 @@ msgstr "assign correspondent from"
 #: paperless_mail/models.py:205
 msgid "assign this correspondent"
 msgstr "assign this correspondent"
+